From 5155c72d8c43387d60e126e8e100cfe2b3d99e1c Mon Sep 17 00:00:00 2001 From: ChrisAdderley Date: Mon, 10 Jun 2019 10:30:05 -0700 Subject: [PATCH] Update some strings and object names --- .../GameData/ReStock/Localization/en-us.cfg | 3 +- .../Structural/restock-structural-truss.cfg | 83 ++++++++++++++++--- Distribution/Restock/changelog.txt | 14 ++-- .../ReStockPlus/Localization/en-us.cfg | 7 +- .../Structural/radial/restock-truss-3.cfg | 8 +- .../Structural/radial/restock-truss-hub-1.cfg | 10 ++- Distribution/RestockPlus/changelog.txt | 2 +- Distribution/RestockPlus/readme.txt | 10 ++- 8 files changed, 102 insertions(+), 35 deletions(-) diff --git a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg index 1372b6c1..0a5b1bba 100644 --- a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg +++ b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg @@ -32,8 +32,9 @@ Localization #LOC_Restock_variant-antenna_axial_reverse = Axial (Reversed) #LOC_Restock_variant-surface_metal = Metal + #LOC_Restock_variant-surface_basic = Basic #LOC_Restock_variant-surface_truss = Truss - #LOC_Restock_variant-surface_thermalblankets = Thermal Blankets + #LOC_Restock_variant-surface_thermalblankets = Insulated #LOC_Restock_variant-service-bay-opaque = Solid Caps #LOC_Restock_variant-service-bay-transparent = Truss Caps diff --git a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg index b571db4d..b514b640 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Structural/restock-structural-truss.cfg @@ -82,8 +82,8 @@ primaryColor = #6f6e6d GAMEOBJECTS { - GirderMetal = true - GirderThermalBlankets = false + Girder = true + GirderBlankets = false } } VARIANT @@ -93,8 +93,8 @@ primaryColor = #ffffff GAMEOBJECTS { - GirderMetal = false - GirderThermalBlankets = true + Girder = false + GirderBlankets = true } } } @@ -125,8 +125,8 @@ primaryColor = #6f6e6d GAMEOBJECTS { - GirderXLMetal = true - GirderXLThermalBlankets = false + GirderXL = true + GirderXLBlankets = false } } VARIANT @@ -136,8 +136,8 @@ primaryColor = #ffffff GAMEOBJECTS { - GirderXLMetal = false - GirderXLThermalBlankets = true + GirderXL = false + GirderXLBlankets = true } } } @@ -179,11 +179,25 @@ VARIANT { name = Basic - displayName = #LOC_Restock_variant-surface_metal + displayName = #LOC_Restock_variant-surface_basic primaryColor = #6f6e6d GAMEOBJECTS { IBeam = true + IBeamTruss = false + IBeamBlankets = false + } + } + VARIANT + { + name = Truss + displayName = #LOC_Restock_variant-surface_truss + primaryColor = #6f6e6d + primaryColor = #000000 + GAMEOBJECTS + { + IBeam = false + IBeamTruss = true IBeamBlankets = false } } @@ -195,6 +209,7 @@ GAMEOBJECTS { IBeam = false + IBeamTruss = false IBeamBlankets = true } } @@ -222,11 +237,25 @@ VARIANT { name = Basic - displayName = #LOC_Restock_variant-surface_metal + displayName = #LOC_Restock_variant-surface_basic primaryColor = #6f6e6d GAMEOBJECTS { IBeamShort = true + IBeamShortTruss = false + IBeamShortBlankets = false + } + } + VARIANT + { + name = Truss + displayName = #LOC_Restock_variant-surface_truss + primaryColor = #6f6e6d + primaryColor = #000000 + GAMEOBJECTS + { + IBeamShort = false + IBeamShortTruss = true IBeamShortBlankets = false } } @@ -238,6 +267,7 @@ GAMEOBJECTS { IBeamShort = false + IBeamShortTruss = false IBeamShortBlankets = true } } @@ -257,6 +287,35 @@ scale = 1,1,1 rotation = 0, 0, 0 } + MODULE + { + name = ModulePartVariants + useMultipleDragCubes = false + baseVariant = Basic + VARIANT + { + name = Basic + displayName = #LOC_Restock_variant-surface_basic + primaryColor = #6f6e6d + GAMEOBJECTS + { + IBeamWide = true + IBeamWideTruss = false + } + } + VARIANT + { + name = Truss + displayName = #LOC_Restock_variant-surface_truss + primaryColor = #6f6e6d + primaryColor = #000000 + GAMEOBJECTS + { + IBeamWide = false + IBeamWideTruss = true + } + } + } } // Small structural panel @@ -280,7 +339,7 @@ VARIANT { name = Basic - displayName = #LOC_Restock_variant-surface_metal + displayName = #LOC_Restock_variant-surface_basic primaryColor = #6f6e6d GAMEOBJECTS { @@ -396,7 +455,7 @@ VARIANT { name = Basic - displayName = #LOC_Restock_variant-surface_metal + displayName = #LOC_Restock_variant-surface_basic primaryColor = #6f6e6d GAMEOBJECTS { diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index 500431d1..e58c8e41 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -5,14 +5,14 @@ v0.2.0 - Coupling - Advanced Grabbing Unit (Andrew Cassidy) - Structural - - Modular Girder Segment (Nertea): new Thermal Blanket variant - - Modular Girder Segment XL (Nertea): new Thermal Blanket variant + - Modular Girder Segment (Nertea): new Insulated variant + - Modular Girder Segment XL (Nertea): new Insulated variant - Modular Girder Segment Adapter (Nertea) - - M-1x1 Structural Panel (Nertea): now has Basic, Skeletal, Thermal Blanket, White, Gold Foil, Silver foil variants - - M-2x2 Structural Panel (Nertea): now has Basic, Skeletal, Thermal Blanket, White, Gold Foil, Silver foil variants - - M-Beam 200 I-Beam (Nertea): now has Basic, Thermal Blanket variants - - M-Beam 200 I-Beam Pocket Edition (Nertea): now has Basic, Thermal Blanket variants - - M-Beam 650 I-Beam (Nertea) + - M-1x1 Structural Panel (Nertea): now has Basic, Truss, Insulated, White, Gold Foil, Silver foil variants + - M-2x2 Structural Panel (Nertea): now has Basic, Truss, Insulated, White, Gold Foil, Silver foil variants + - M-Beam 200 I-Beam (Nertea): now has Basic, Truss, Insulated variants + - M-Beam 200 I-Beam Pocket Edition (Nertea): now has Basic, Truss, Insulated variants + - M-Beam 650 I-Beam (Nertea): now has Basic, Truss variants - Resources - 'Drill-O-Matic' Mining Excavator (Andrew Cassidy) - 'Drill-O-Matic Junior' Mining Excavator (Andrew Cassidy) diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg index d1efdeb8..8a83c74d 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg @@ -15,7 +15,6 @@ Localization #LOC_RestockPlus_light_rotate_off = Base Rotation #LOC_RestockPlus_light_rotate_toggle = Rotate Light - // ENGINES // ======= // 3.75m @@ -55,7 +54,6 @@ Localization #LOC_RestockPlus_restock-engine-srb-striker_description = Extending the Mallet with additional segments can provide more boom than your integration team knows what to do with! #LOC_RestockPlus_restock-engine-srb-striker_tags = a moar (more motor rocket srb restock striker - // CONTROL // ======= @@ -182,7 +180,6 @@ Localization #LOC_RestockPlus_restock-heatshield-1875-1_description = A specially sized thermal shield for medium sized rockets. Curiously, has a passageway for a hatch in there - almost looks like it was made by moles. #LOC_RestockPlus_restock-heatshield-1875-1_tags = ablat drag entry insulate protect re- rocket therm restock - // COMMAND // ======== @@ -227,7 +224,7 @@ Localization // 0.625m #LOC_RestockPlus_restock-nosecone-0625-1_title = Miniature Rocket Nose - #LOC_RestockPlus_restock-nosecone-0625-1_description = A slightly more rocket-appropriate nosecone, available in white and shiny metal finishes. + #LOC_RestockPlus_restock-nosecone-0625-1_description = A slightly more rocket-appropriate tiny nosecone, available in white and shiny metal finishes. #LOC_RestockPlus_restock-nosecone-0625-1_tags = restock aero aircraft booster )cap drag fligh plane rocket speed stab stream nose // 1.875m @@ -341,7 +338,7 @@ Localization #LOC_RestockPlus_restock-ladder-static-2_tags = #LOC_RestockPlus_restock-ladder-static-3_title = Pegasus III Mobility Enhancer - #LOC_RestockPlus_restock-ladder-static-3_description = + #LOC_RestockPlus_restock-ladder-static-3_description = A much needed enhancement to a mobility enhancement. It is very long. #LOC_RestockPlus_restock-ladder-static-3_tags = } } diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/radial/restock-truss-3.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/radial/restock-truss-3.cfg index 64a57c31..423efd3d 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/radial/restock-truss-3.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/radial/restock-truss-3.cfg @@ -49,8 +49,8 @@ PART primaryColor = #6f6e6d GAMEOBJECTS { - GirderXLMetal = true - GirderXLThermalBlankets = false + GirderXXL = true + GirderXXLBlankets = false } } VARIANT @@ -60,8 +60,8 @@ PART primaryColor = #ffffff GAMEOBJECTS { - GirderXLMetal = false - GirderXLThermalBlankets = true + GirderXXL = false + GirderXXLBlankets = true } } } diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/radial/restock-truss-hub-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/radial/restock-truss-hub-1.cfg index ad853947..1a79b83f 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/radial/restock-truss-hub-1.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Structural/radial/restock-truss-hub-1.cfg @@ -15,8 +15,12 @@ PART author = Chris Adderley (Nertea) rescaleFactor = 1 - node_stack_bottom = 0.0, -2.950476, 0.0, 0.0, -1.0, 0.0, 1 - node_stack_top = 0.0, 2.950476, 0.0, 0.0, 1.0, 0.0, 1 + node_stack_right = 0.5592728, 0, 0, 1, 0, 0, 1 + node_stack_left = -0.5592728, 0, 0, -1, 0, 0, 1 + node_stack_back = 0, 0, 0.5592728, 0, 0, 1, 1 + node_stack_front = 0, 0,-0.5592728, 0, 0, -1, 1 + node_stack_top = 0, 0.5592728, 0, 0, 1, 0, 1 + node_stack_bottom = 0, -0.5592728, 0, 0, -1, 0, 1 TechRequired = advMetalworks entryCost = 5000 @@ -24,7 +28,7 @@ PART category = Structural subcategory = 0 title = #LOC_RestockPlus_restock-truss-hub-1_title - manufacturer = + manufacturer = description = #LOC_RestockPlus_restock-truss-hub-1_description tags = #LOC_RestockPlus_restock-truss-hub-1_tags attachRules = 1,1,1,1,0 diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt index cf7f7735..80d00735 100644 --- a/Distribution/RestockPlus/changelog.txt +++ b/Distribution/RestockPlus/changelog.txt @@ -26,7 +26,7 @@ v0.2.0 - New Structural parts - FL-XA30 Adapter (Nertea): 1.875m to 2.5m flat adapter (White, Black and White, Dark Grey/Orange and Metallic variants) - FL-XA15 Adapter (Nertea): 1.25m to 1.875m flat adapter (White, Black and White, Dark Grey/Orange and Metallic variants) - - Modular Girder Segment XXL (Nertea): double length XL Girder (Basic and Thermal Blanket variants) + - Modular Girder Segment XXL (Nertea): double length XL Girder (Basic and Insulated variants) - Modular Girder Segment Hub (Nertea): Girder style 6-way hub - Modular Girder Small Adapter (Nertea): Girder to 0.625m adapter - New Electrical parts diff --git a/Distribution/RestockPlus/readme.txt b/Distribution/RestockPlus/readme.txt index f76051ef..32521f1a 100644 --- a/Distribution/RestockPlus/readme.txt +++ b/Distribution/RestockPlus/readme.txt @@ -6,9 +6,15 @@ Restock+ is a complement to Restock which adds useful parts that we feel are mis - 0.625m parts: Completing this range with other tiny parts, including fairings, more fuel tanks, engines and the like. - 1.875m parts: Completing this range with missing parts like drone cores, service bays, batteries, and reaction wheels. -- 3.75m parts: Completing this range with a guidance unit, docking port, engines, and nosecones. +- 3.75m parts: Completing this range with missing parts such as a guidance unit, docking port, vacuum engine, and nosecones. +- RCS thrusters: a set of new, versatile RCS thruster types that complement the stock offerings, plus a whole new miniature set for smaller craft and probes. +- Science parts: a couple of new form factors for existing experiments as well as sample return containers. +- Antennae: New variations on antenna for better craft construction. -In addition some glaring bugfixes and improvements are included. For a full list of changes and additions, consult the changelog. +In addition some glaring bugfixes and improvements are included: +- The volume of the Oscar-B tank has been reduced to make room for the rest of the Oscar series tanks. The tank's mass ratio is unchanged + +For a full list of changes and additions, consult the changelog. ============ DEPENDENCIES