diff --git a/Assets/CineboxAndrew/Science/Goo_Cannister.blend b/Assets/CineboxAndrew/Science/Goo_Cannister.blend new file mode 100644 index 00000000..2c3de98c Binary files /dev/null and b/Assets/CineboxAndrew/Science/Goo_Cannister.blend differ diff --git a/Assets/CineboxAndrew/Science/restock-materialsBay-1.blend b/Assets/CineboxAndrew/Science/restock-materialsBay-1.blend new file mode 100644 index 00000000..ad7b6517 Binary files /dev/null and b/Assets/CineboxAndrew/Science/restock-materialsBay-1.blend differ diff --git a/Assets/CineboxAndrew/Science/restock-materialsBay-2.blend b/Assets/CineboxAndrew/Science/restock-materialsBay-2.blend new file mode 100644 index 00000000..e3af79c1 Binary files /dev/null and b/Assets/CineboxAndrew/Science/restock-materialsBay-2.blend differ diff --git a/Assets/CineboxAndrew/Science/restock-science-1-n.psd b/Assets/CineboxAndrew/Science/restock-science-1-n.psd new file mode 100644 index 00000000..0ad1db18 Binary files /dev/null and b/Assets/CineboxAndrew/Science/restock-science-1-n.psd differ diff --git a/Assets/CineboxAndrew/Science/restock-science-1-s.psd b/Assets/CineboxAndrew/Science/restock-science-1-s.psd new file mode 100644 index 00000000..0aa486b5 Binary files /dev/null and b/Assets/CineboxAndrew/Science/restock-science-1-s.psd differ diff --git a/Assets/CineboxAndrew/Science/restock-science-1.psd b/Assets/CineboxAndrew/Science/restock-science-1.psd new file mode 100644 index 00000000..293df410 Binary files /dev/null and b/Assets/CineboxAndrew/Science/restock-science-1.psd differ diff --git a/Assets/CineboxAndrew/Science/restock-science-2 b/Assets/CineboxAndrew/Science/restock-science-2 new file mode 100644 index 00000000..44064a31 Binary files /dev/null and b/Assets/CineboxAndrew/Science/restock-science-2 differ diff --git a/Assets/CineboxAndrew/Science/restock-science-2-e.psd b/Assets/CineboxAndrew/Science/restock-science-2-e.psd new file mode 100644 index 00000000..cf3338af Binary files /dev/null and b/Assets/CineboxAndrew/Science/restock-science-2-e.psd differ diff --git a/Assets/CineboxAndrew/Science/restock-science-2-n.psd b/Assets/CineboxAndrew/Science/restock-science-2-n.psd new file mode 100644 index 00000000..c2fd5deb Binary files /dev/null and b/Assets/CineboxAndrew/Science/restock-science-2-n.psd differ diff --git a/Assets/CineboxAndrew/Science/restock-science-2.psd b/Assets/CineboxAndrew/Science/restock-science-2.psd new file mode 100644 index 00000000..705bfbab Binary files /dev/null and b/Assets/CineboxAndrew/Science/restock-science-2.psd differ diff --git a/Assets/CineboxAndrew/Science/restock-science-3.psd b/Assets/CineboxAndrew/Science/restock-science-3.psd new file mode 100644 index 00000000..0626f22a Binary files /dev/null and b/Assets/CineboxAndrew/Science/restock-science-3.psd differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Command/restock-cupola-lab-1.tga old mode 100644 new mode 100755 diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1-e.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1-e.tga new file mode 100644 index 00000000..35bdf7a2 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1-e.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1-n.tga new file mode 100644 index 00000000..5527a984 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1.tga new file mode 100644 index 00000000..b927cb66 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625.mu new file mode 100644 index 00000000..c9e2c957 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-0625.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5-e.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1-e.tga similarity index 100% rename from Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5-e.tga rename to Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1-e.tga diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1-n.tga similarity index 100% rename from Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5-n.tga rename to Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1-n.tga diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.mu index 0174e547..cd7bacc8 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.tga similarity index 100% rename from Distribution/Restock/GameData/ReStock/Assets/Coupling/sspx-125-5.tga rename to Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-1.tga diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-shielded-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-shielded-1-n.tga new file mode 100644 index 00000000..eaa5ec36 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-shielded-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-shielded-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-shielded-1.tga new file mode 100644 index 00000000..66fa1e59 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-125-shielded-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1.mu new file mode 100644 index 00000000..f5596048 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1.tga new file mode 100644 index 00000000..004a0aed Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-25-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-shielded-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-shielded-125-1.mu new file mode 100644 index 00000000..1bbcfee8 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-docking-shielded-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1-e.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1-e.tga new file mode 100644 index 00000000..efd7847b Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1-e.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1-n.tga new file mode 100644 index 00000000..9e64ee40 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1.tga new file mode 100644 index 00000000..806e6a44 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Coupling/restock-hatch-0625-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-1.tga index 067af199..d603781a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-1.tga and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-flea-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-flea-1.mu index 0d93d378..ddc00d67 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-flea-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-flea-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-hammer-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-hammer-1.mu index 898d5ae3..e5768b2a 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-hammer-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-hammer-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-variants-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-variants-1.tga new file mode 100644 index 00000000..26b821a7 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-srb-variants-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-twinboar-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-twinboar-1.mu index 8e849011..5e9f4fcb 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-twinboar-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-twinboar-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-625-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-625-1.mu new file mode 100644 index 00000000..3c41e58a Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-625-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-radial-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-radial-1.mu new file mode 100644 index 00000000..51a45afd Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-goocanister-radial-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-125-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-125-1.mu new file mode 100644 index 00000000..63b60866 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-125-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-radial-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-radial-1.mu new file mode 100644 index 00000000..6542c128 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-materialbay-radial-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1-n.tga new file mode 100644 index 00000000..1d772964 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1.tga new file mode 100644 index 00000000..4515b5d8 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-1.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-e.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-e.tga new file mode 100644 index 00000000..c82dfe04 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-e.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-n.tga new file mode 100644 index 00000000..acd27297 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2-n.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2.tga new file mode 100644 index 00000000..3001c587 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-2.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-3.tga b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-3.tga new file mode 100644 index 00000000..be31321e Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Science/restock-science-3.tga differ diff --git a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg index 6e4d6873..5a01eb22 100644 --- a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg +++ b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg @@ -16,6 +16,9 @@ Localization #LOC_Restock_variant-engine_radial = Radial #LOC_Restock_variant-engine_boattail = Boattail + #LOC_Restock_variant-mounting_truss = Truss + #LOC_Restock_variant-mounting_compact = Compact + #LOC_Restock_variant-surface_metal = Metal #LOC_Restock_variant-service-bay-opaque = Solid Caps diff --git a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg index 1a7de173..b601e579 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-docking.cfg @@ -1,7 +1,60 @@ // Patches applying art changes to crewed utility/science parts // Contents: // - Inline Clamp-O-Tron (dockingPortLateral) +// - Clamp-O-Tron Jr. Docking Port (dockingPort3) // - Clamp-O-Tron Docking Port (dockingPort2) +// - Clamp-O-Tron Sr. Docking Port (dockingPortLarge) +// - Clamp-O-Tron Shielded Docking Port (dockingPort1) + +// Clamp-O-Tron Jr +@PART[dockingPort3] { + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/Coupling/restock-docking-0625 + } + + %rescaleFactor = 1 + MODULE + { + name = ModuleColorChanger + shaderProperty = _EmissiveColor + animRate = 0.8 + animState = false + useRate = true + toggleInEditor = true + toggleInFlight = true + toggleInFlight = true + unfocusedRange = 5 + toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights + eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On + eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off + toggleAction = True + defaultActionGroup = Light + redCurve + { + key = 0 0 0 3 + key = 1 1 0 0 + } + greenCurve + { + key = 0 0 0 1 + key = 1 1 1 0 + } + blueCurve + { + key = 0 0 0 0 + key = 1 0.7 1.5 0 + } + alphaCurve + { + key = 0 1 + } + } + } + // Inline Clamp-O-Tron @PART[dockingPortLateral] { @@ -17,7 +70,8 @@ %rescaleFactor = 1 %manufacturer = #autoLOC_501624 } -// Inline Clamp-O-Tron + +// Clamp-O-Tron @PART[dockingPort2] { @author = Chris Adderley (Nertea) @@ -65,3 +119,207 @@ } } } + +// Clamp-O-Tron Shielded +@PART[dockingPort1] { + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/Coupling/restock-docking-shielded-125-1 + } + + %rescaleFactor = 1 + + @MODULE[ModuleAnimateGeneric] + { + @animationName = PortExtend + + } + MODULE + { + name = ModuleColorChanger + shaderProperty = _EmissiveColor + animRate = 0.8 + animState = false + useRate = true + toggleInEditor = true + toggleInFlight = true + toggleInFlight = true + unfocusedRange = 5 + toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights + eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On + eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off + toggleAction = True + defaultActionGroup = Light + redCurve + { + key = 0 0 0 3 + key = 1 1 0 0 + } + greenCurve + { + key = 0 0 0 1 + key = 1 1 1 0 + } + blueCurve + { + key = 0 0 0 0 + key = 1 0.7 1.5 0 + } + alphaCurve + { + key = 0 1 + } + } + MODULE + { + name = FXModuleLookAtConstraint + // Ring + CONSTRAINLOOKFX + { + targetName = DockingCylBottom01 + rotatorsName = DockingCylTop01 + } + CONSTRAINLOOKFX + { + targetName = DockingCylBottom02 + rotatorsName = DockingCylTop02 + } + CONSTRAINLOOKFX + { + targetName = DockingCylBottom03 + rotatorsName = DockingCylTop03 + } + CONSTRAINLOOKFX + { + targetName = DockingCylBottom04 + rotatorsName = DockingCylTop04 + } + CONSTRAINLOOKFX + { + targetName = DockingCylBottom05 + rotatorsName = DockingCylTop05 + } + CONSTRAINLOOKFX + { + targetName = DockingCylBottom06 + rotatorsName = DockingCylTop06 + } + + CONSTRAINLOOKFX + { + targetName = DockingCylTop01 + rotatorsName = DockingCylBottom01 + } + CONSTRAINLOOKFX + { + targetName = DockingCylTop02 + rotatorsName = DockingCylBottom02 + } + CONSTRAINLOOKFX + { + targetName = DockingCylTop03 + rotatorsName = DockingCylBottom03 + } + CONSTRAINLOOKFX + { + targetName = DockingCylTop04 + rotatorsName = DockingCylBottom04 + } + CONSTRAINLOOKFX + { + targetName = DockingCylTop05 + rotatorsName = DockingCylBottom05 + } + CONSTRAINLOOKFX + { + targetName = DockingCylTop06 + rotatorsName = DockingCylBottom06 + } + + // Doors + CONSTRAINLOOKFX + { + targetName = ShldCylBottom01 + rotatorsName = ShldCylTop01 + } + CONSTRAINLOOKFX + { + targetName = ShldCylTop01 + rotatorsName = ShldCylBottom01 + } + CONSTRAINLOOKFX + { + targetName = ShldCylBottom02 + rotatorsName = ShldCylTop02 + } + CONSTRAINLOOKFX + { + targetName = ShldCylTop02 + rotatorsName = ShldCylBottom02 + } + CONSTRAINLOOKFX + { + targetName = ShldCylBottom03 + rotatorsName = ShldCylTop03 + } + CONSTRAINLOOKFX + { + targetName = ShldCylTop03 + rotatorsName = ShldCylBottom03 + } + + } + } + + +// Clamp-O-Tron Sr +@PART[dockingPortLarge] { + @author = Chris Adderley (Nertea) + + !mesh = DELETE + !MODEL {} + MODEL { + model = ReStock/Assets/Coupling/restock-docking-25-1 + } + + %rescaleFactor = 1 + MODULE + { + name = ModuleColorChanger + shaderProperty = _EmissiveColor + animRate = 0.8 + animState = false + useRate = true + toggleInEditor = true + toggleInFlight = true + toggleInFlight = true + unfocusedRange = 5 + toggleName = #autoLOC_502011 //#autoLOC_502011 = Toggle Lights + eventOnName = #autoLOC_502012 //#autoLOC_502012 = Lights On + eventOffName = #autoLOC_502013 //#autoLOC_502013 = Lights Off + toggleAction = True + defaultActionGroup = Light + redCurve + { + key = 0 0 0 3 + key = 1 1 0 0 + } + greenCurve + { + key = 0 0 0 1 + key = 1 1 1 0 + } + blueCurve + { + key = 0 0 0 0 + key = 1 0.7 1.5 0 + } + alphaCurve + { + key = 0 1 + } + } + } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg index 95a89807..425c3f18 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg @@ -3,7 +3,7 @@ // - Kickback (MassiveBooster) // - Thumper (solidBooster1-1) // - Hammer (solidBooster) -// - Flea (solidBooster_sm) +// - Flea (solidBooster_sm_v2) // - Separatron I (sepMotor1) // Kickback @@ -287,7 +287,7 @@ } // Hammer -@PART[solidBooster] { +@PART[solidBooster_v2] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -297,9 +297,9 @@ } %rescaleFactor = 1 @scale = 1 - @node_stack_bottom = 0.0, -1.5640875, 0.0, 0.0, -1.0, 0.0, 1 - @node_stack_top = 0.0, 1.2818375, 0.0, 0.0, 1.0, 0.0, 1 - @node_attach = 0.0, 0.0, -0.625, 0.0, 0.0, 1.0, 1 + // @node_stack_bottom = 0.0, -1.5640875, 0.0, 0.0, -1.0, 0.0, 1 + // @node_stack_top = 0.0, 1.2818375, 0.0, 0.0, 1.0, 0.0, 1 + // @node_attach = 0.0, 0.0, -0.625, 0.0, 0.0, 1.0, 1 !fx_exhaustFlame_yellow = DELETE !fx_smokeTrail_medium = DELETE @@ -387,10 +387,49 @@ @animationName = restock-srb-hammer-heat-1 @responseSpeed = 0.1 } + @MODULE[ModulePartVariants] + { + baseVariant = White + !primaryColor = DELETE + !secondaryColor = DELETE + !baseDisplayName = DELETE + !baseThemeName = DELETE + VARIANT + { + name = White + primaryColor = #ffffff + secondaryColor = #ffffff + displayName = #autoLOC_8007119 + themeName = White + GAMEOBJECTS + { + YellowStripe = false + OrangeStripe = false + } + } + @VARIANT[YellowAndWhite] + { + !TEXTURE {} + GAMEOBJECTS + { + YellowStripe = true + OrangeStripe = false + } + } + @VARIANT[Orange] + { + !TEXTURE {} + GAMEOBJECTS + { + YellowStripe = false + OrangeStripe = true + } + } + } } // Flea -@PART[solidBooster_sm] { +@PART[solidBooster_sm_v2] { @author = Chris Adderley (Nertea) !mesh = DELETE @@ -488,6 +527,45 @@ dependOnEngineState = True dependOnThrottle = True } + @MODULE[ModulePartVariants] + { + baseVariant = White + !primaryColor = DELETE + !secondaryColor = DELETE + !baseDisplayName = DELETE + !baseThemeName = DELETE + VARIANT + { + name = White + primaryColor = #ffffff + secondaryColor = #ffffff + displayName = #autoLOC_8007119 + themeName = White + GAMEOBJECTS + { + YellowStripe = false + OrangeStripe = false + } + } + @VARIANT[YellowAndWhite] + { + !TEXTURE {} + GAMEOBJECTS + { + YellowStripe = true + OrangeStripe = false + } + } + @VARIANT[Orange] + { + !TEXTURE {} + GAMEOBJECTS + { + YellowStripe = false + OrangeStripe = true + } + } + } } // Separatron @PART[sepMotor1] { @@ -506,7 +584,7 @@ !sound_vent_medium = DELETE !sound_rocket_mini = DELETE !sound_vent_soft = DELETE - + EFFECTS { engage @@ -561,16 +639,17 @@ speed = 0.0 0.35 speed = 1.0 1.0 } - + } } - + @MODULE[ModuleEngines] { @name = ModuleEnginesFX %runningEffectName = fx-separatron-running } + MODULE { name = FXModuleAnimateThrottle diff --git a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg index 45d09c15..5dee4da7 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/FuelTank/restock-fueltanks-125.cfg @@ -10,24 +10,26 @@ @author = Porkjet !mesh = DELETE - !MODEL = {} + !MODEL {} MODEL { model = ReStock/Assets/FuelTank/restock-fueltank-125-4 } + !MODULE[ModulePartVariants] {} } @PART[fuelTankSmall] { @author = Porkjet - @node_stack_top = 0.0, 5.5525, 0.0, 0.0, 1.0, 0.0 - @node_stack_bottom = 0.0, -5.5525, 0.0, 0.0, -1.0, 0.0 - @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1 + // @node_stack_top = 0.0, 5.5525, 0.0, 0.0, 1.0, 0.0 + // @node_stack_bottom = 0.0, -5.5525, 0.0, 0.0, -1.0, 0.0 + // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1 !mesh = DELETE - !MODEL = {} + !MODEL {} MODEL { model = ReStock/Assets/FuelTank/restock-fueltank-125-3 } %rescaleFactor = 1 + !MODULE[ModulePartVariants] {} } @PART[fuelTank] @@ -35,26 +37,28 @@ @author = Porkjet !mesh = DELETE - !MODEL = {} + !MODEL {} MODEL { model = ReStock/Assets/FuelTank/restock-fueltank-125-2 } %rescaleFactor = 1 - @node_stack_top = 0.0, 9.81725, 0.0, 0.0, 1.0, 0.0 - @node_stack_bottom = 0.0, -9.12500, 0.0, 0.0, -1.0, 0.0 - @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1 + !MODULE[ModulePartVariants] {} + // @node_stack_top = 0.0, 9.81725, 0.0, 0.0, 1.0, 0.0 + // @node_stack_bottom = 0.0, -9.12500, 0.0, 0.0, -1.0, 0.0 + // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1 } @PART[fuelTank_long] { @author = Porkjet - @node_stack_top = 0.0, 18.75, 0.0, 0.0, 1.0, 0.0 - @node_stack_bottom = 0.0, -18.87500, 0.0, 0.0, -1.0, 0.0 - @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1 + // @node_stack_top = 0.0, 18.75, 0.0, 0.0, 1.0, 0.0 + // @node_stack_bottom = 0.0, -18.87500, 0.0, 0.0, -1.0, 0.0 + // @node_attach = 6.2625, 0.0, 0.0, 1.0, 0.0, 0.0, 1 !mesh = DELETE - !MODEL = {} + !MODEL {} MODEL { model = ReStock/Assets/FuelTank/restock-fueltank-125-1 } + !MODULE[ModulePartVariants] {} %rescaleFactor = 1 } diff --git a/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg b/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg index 03287532..68762f72 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg @@ -4,6 +4,8 @@ // - Barometer (sensorBarometer) // - Accelerometer (sensorAccelerometer) // - Negative Gravioli Detector (sensorGravimeter) +// - Mystery Goo™ Containment Unit (GooExperiment) +// - SC-9001 Science Jr. (science_module) // Thermometer @PART[sensorThermometer] { @@ -47,4 +49,66 @@ MODEL { model = ReStock/Assets/Science/restock-gravimeter } +} + +// Mystery Goo™ Containment Unit +@PART[GooExperiment] { + @author = Andrew Cassidy + + !mesh = DELETE + !MODEL = {} + MODEL { + model = ReStock/Assets/Science/restock-goocanister-radial-1 + } + + MODULE { + name = ModulePartVariants + baseVariant = Truss + + VARIANT { + name = Truss + displayName = #LOC_Restock_variant-mounting_truss + themeName = White + + primaryColor = #ffffff + secondaryColor = #000000 + + GAMEOBJECTS { + Mount_Compact = false + Mount_Truss = true + } + } + + VARIANT { + name = Compact + displayName = #LOC_Restock_variant-mounting_compact + themeName = White + + primaryColor = #ffffff + secondaryColor = #707070 + + GAMEOBJECTS { + Mount_Compact = true + Mount_Truss = false + } + } + } +} + +// SC-9001 Science Jr. +@PART[science_module] { + @author = Andrew Cassidy + + !mesh = DELETE + !MODEL = {} + MODEL { + model = ReStock/Assets/Science/restock-materialbay-125-1 + } + + // original model was scaled by 0.1x and had a rescalefactor of 1.25, so we have to reset that + rescaleFactor = 1 + @scale = 1 + @node_stack_top = 0.0, 0.6125, 0.0, 0.0, 1.0, 0.0 + @node_stack_bottom = 0.0, -0.5125, 0.0, 0.0, -1.0, 0.0 + @node_attach = 0.0, 0.0, 0.62625, 0.0, 0.0, -1.0, 1 } \ No newline at end of file diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt index d8f777c7..35e7d945 100644 --- a/Distribution/Restock/changelog.txt +++ b/Distribution/Restock/changelog.txt @@ -10,7 +10,10 @@ - .625m reaction wheel (Andrew Cassidy) - Coupling - Inline Clamp-O-Tron (Passinglurker) + - Clamp-O-Tron Jr. Docking Port (Nertea) - Clamp-O-Tron Docking Port (Nertea) + - Clamp-O-Tron Sr. Docking Port (Nertea) + - Clamp-O-Tron Shielded Port (Nertea) - Aero - Aerodynamic Nose Cone (Nertea) - Protective Rocket Nose Cone Mk7 (Nertea) diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg index 57467381..d1864ca7 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg @@ -41,6 +41,12 @@ Localization #LOC_RestockPlus_restock-fuel-tank-375-4_description = #LOC_RestockPlus_restock-fuel-tank-375-4_tags = + #LOC_RestockPlus_restock-materialbay-radial-1_title = SC-9001R Radial Science Jr. + #LOC_RestockPlus_restock-materialbay-radial-1_description = The SC-9001R has the same set of experiments as the regular Science Jr. Material Bay, but in a conveniant, radial-mountable package. Recommended for ages 4-8. Small parts inside make it not suitable for small children. + #LOC_RestockPlus_restock-materialbay-radial-1_tags = bay experiment lab material research radial sandwich kracken + #LOC_RestockPlus_restock-goocanister-625-1_title = Mystery Goo™ Inline Containment Unit + #LOC_RestockPlus_restock-goocanister-625-1_description = After an unfortunate accident where a technician attempted to stock delicate machinery on the classic Mystery Goo™ canister, FLOOYD Dynamics Labs saw a market opportunity for a version with a flat top and bottom. + #LOC_RestockPlus_restock-goocanister-625-1_tags = experiment research science 0.625 } } diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-goocanister-625-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-goocanister-625-1.cfg new file mode 100644 index 00000000..de16ce96 --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-goocanister-625-1.cfg @@ -0,0 +1,66 @@ +// inline goo canister +PART +{ + name = restock-goocanister-625-1 + module = Part + author = Andrew Cassidy + + MODEL { + model = ReStock/Assets/Science/restock-goocanister-625-1 + scale = 1.0, 1.0, 1.0 + } + rescaleFactor = 1.0 + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,0,1,1,1 + node_stack_top = 0.0, 0.25, 0.0, 0.0, 1.0, 0.0, 0 + node_stack_bottom = 0.0,-0.25, 0.0, 0.0, -1.0, 0.0, 0 + + TechRequired = start + entryCost = 0 + cost = 1000 + category = Science + subcatagory = 0 + title = #LOC_RestockPlus_restock-goocanister-625-1_title //Mystery Goo™ Inline Containment Unit + manufacturer = #LOC_RestockPlus_restock-goocanister-625-1_description + // After an unfortunate accident where a technician attempted to stock delicate machinery on the classic Mystery Goo™ canister, FLOOYD Dynamics Labs saw a market opportunity for a version with a flat top and bottom. + mass = 0.10 + dragModelType = default + dragModelType = default + maximum_drag = 0.1 + minimum_drag = 0.1 + angularDrag = 2 + crashTolerance = 12 + maxTemp = 1200 // = 2900 + breakingForce = 50 + breakingTorque = 50 + childStageOffset = 1 + bulkheadProfiles = size0 + tags = #LOC_RestockPlus_restock-goocanister-625-1_tags + + MODULE { + name = ModuleAnimateGeneric + animationName = inline-Deploy + startEventGUIName = Deploy + endEventGUIName = Close + actionGUIName = Toggle Cover + evaDistance = 1.5 + } + + MODULE { + name = ModuleScienceExperiment + experimentID = mysteryGoo + experimentActionName = Observe Mystery Goo + resetActionName = Reset Goo Canister + useStaging = False + useActionGroups = True + hideUIwhenUnavailable = True + xmitDataScalar = 0.3 + FxModules = 0 + dataIsCollectable = True + collectActionName = Collect Data + interactionRange = 1.5 + usageReqMaskInternal = 1 + usageReqMaskExternal = 8 + } +} \ No newline at end of file diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-materialbay-radial-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-materialbay-radial-1.cfg new file mode 100644 index 00000000..d3caa39f --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-materialbay-radial-1.cfg @@ -0,0 +1,101 @@ +// Radial material science bay +PART +{ + name = restock-materialbay-radial-1 + module = Part + author = Andrew Cassidy + + MODEL { + model = ReStock/Assets/Science/restock-materialbay-radial-1 + scale = 1.0, 1.0, 1.0 + } + rescaleFactor = 1.0 + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,1,0,1,1 + node_attach = 0.0, 0.0, 0.345, 0.0, 0.0, -1.0, 1 + node_stack_bottom = 0.0, 0.0, 0.33, 0.0, 0.0, 1.0, 1 + + TechRequired = basicScience + entryCost = 5500 + cost = 1800 + category = Science + subcatagory = 0 + title = #LOC_RestockPlus_restock-materialbay-radial-1_title //SC-9001R Radial Science Jr. + manufacturer = #LOC_RestockPlus_restock-materialbay-radial-1_description + // The SC-9001R has the same set of experiments as the regular Science Jr. Material Bay, but in a conveniant, radial-mountable package. Recommended for ages 4-8. Small parts inside make it not suitable for small children. + mass = 0.2 + dragModelType = default + maximum_drag = 0.2 + minimum_drag = 0.3 + angularDrag = 2 + crashTolerance = 6 + maxTemp = 1200 // = 2900 + breakingForce = 50 + breakingTorque = 50 + childStageOffset = 1 + bulkheadProfiles = srf + tags = #LOC_RestockPlus_restock-materialbay-radial-1_tags //bay experiment lab material research radial sandwich + + MODULE + { + name = ModuleAnimateGeneric + animationName = radial-Deploy + startEventGUIName = Open Doors + endEventGUIName = Close Doors + actionGUIName = Toggle Doors + evaDistance = 1.85 + } + + MODULE + { + name = ModuleScienceExperiment + experimentID = mobileMaterialsLab + experimentActionName = Observe Materials Bay + resetActionName = Reset Materials Bay + useStaging = False + useActionGroups = True + hideUIwhenUnavailable = True + hideFxModuleUI = False + xmitDataScalar = 0.35 + FxModules = 0 + dataIsCollectable = True + collectActionName = Collect Data + interactionRange = 1.85 + usageReqMaskInternal = 1 + usageReqMaskExternal = 8 + } + + MODULE { + name = ModulePartVariants + baseVariant = Truss + + VARIANT { + name = Truss + displayName = #LOC_Restock_variant-mounting_truss + themeName = White + + primaryColor = #ffffff + secondaryColor = #000000 + + GAMEOBJECTS { + Mount_Compact = false + Mount_Truss = true + } + } + + VARIANT { + name = Compact + displayName = #LOC_Restock_variant-mounting_compact + themeName = White + + primaryColor = #ffffff + secondaryColor = #707070 + + GAMEOBJECTS { + Mount_Compact = true + Mount_Truss = false + } + } + } +} \ No newline at end of file diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Science/dmagic-science-animate.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Science/dmagic-science-animate.cfg new file mode 100644 index 00000000..a09adf4d --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Science/dmagic-science-animate.cfg @@ -0,0 +1,155 @@ +@PART[GooExperiment]:NEEDS[DMModuleScienceAnimateGeneric] { + -MODULE[ModuleAnimateGeneric]{} + -MODULE[ModuleScienceExperiment]{} + + MODULE { + name = DMModuleScienceAnimateGeneric + + //science module values + experimentID = mysteryGoo + experimentActionName = Observe Mystery Goo + resetActionName = Reset Goo Canister + useStaging = False + useActionGroups = True + hideUIwhenUnavailable = True + xmitDataScalar = 0.3 + dataIsCollectable = True + collectActionName = Collect Data + interactionRange = 1.5 + usageReqMaskInternal = 1 + usageReqMaskExternal = 8 + externalDeploy = true + + //animation values + animationName = Deploy + startEventGUIName = Open Doors + endEventGUIName = Close Doors + + useSampleTransforms = true + sampleTransformName = Canister + + dataRemovalAnimation = true + dataRemovalAnimationReverse = true + dataRemovalAnimationName = Extract + waitForDataRemoval = true + } +} + +@PART[science_module]:NEEDS[DMModuleScienceAnimateGeneric] { + -MODULE[ModuleAnimateGeneric]{} + -MODULE[ModuleScienceExperiment]{} + + MODULE { + name = DMModuleScienceAnimateGeneric + + //science module values + experimentID = mobileMaterialsLab + experimentActionName = Observe Materials Bay + resetActionName = Reset Materials Bay + useStaging = False + useActionGroups = True + hideUIwhenUnavailable = True + xmitDataScalar = 0.3 + dataIsCollectable = True + collectActionName = Collect Data + interactionRange = 1.5 + usageReqMaskInternal = 1 + usageReqMaskExternal = 8 + externalDeploy = true + + //animation values + animationName = Deploy + startEventGUIName = Open Doors + endEventGUIName = Close Doors + + useSampleTransforms = true + sampleTransformName = Experiments_Disappearing + + useReplacementTransforms = true + replacementTransformName = Experiments_Used + replacementTransformScale = 1.0 + + dataRemovalAnimation = true + dataRemovalAnimationReverse = true + dataRemovalAnimationName = Extract + waitForDataRemoval = false + } +} + +@PART[restock-goocanister-625-1]:NEEDS[DMModuleScienceAnimateGeneric] { + -MODULE[ModuleAnimateGeneric]{} + -MODULE[ModuleScienceExperiment]{} + + MODULE { + name = DMModuleScienceAnimateGeneric + + //science module values + experimentID = mysteryGoo + experimentActionName = Observe Mystery Goo + resetActionName = Reset Goo Canister + useStaging = False + useActionGroups = True + hideUIwhenUnavailable = True + xmitDataScalar = 0.3 + dataIsCollectable = True + collectActionName = Collect Data + interactionRange = 1.5 + usageReqMaskInternal = 1 + usageReqMaskExternal = 8 + externalDeploy = true + + //animation values + animationName = inline-Deploy + startEventGUIName = Open Doors + endEventGUIName = Close Doors + + useSampleTransforms = true + sampleTransformName = Canister + + dataRemovalAnimation = true + dataRemovalAnimationReverse = true + dataRemovalAnimationName = inline-Extract + waitForDataRemoval = true + } +} + +@PART[restock-materialbay-radial-1]:NEEDS[DMModuleScienceAnimateGeneric] { + -MODULE[ModuleAnimateGeneric]{} + -MODULE[ModuleScienceExperiment]{} + + MODULE { + name = DMModuleScienceAnimateGeneric + + //science module values + experimentID = mobileMaterialsLab + experimentActionName = Observe Materials Bay + resetActionName = Reset Materials Bay + useStaging = False + useActionGroups = True + hideUIwhenUnavailable = True + xmitDataScalar = 0.3 + dataIsCollectable = True + collectActionName = Collect Data + interactionRange = 1.5 + usageReqMaskInternal = 1 + usageReqMaskExternal = 8 + externalDeploy = true + + //animation values + animationName = radial-Deploy + startEventGUIName = Open Doors + endEventGUIName = Close Doors + + useSampleTransforms = true + sampleTransformName = Experiments_Disappearing + + useReplacementTransforms = true + replacementTransformName = Experiments_Used + replacementTransformScale = 1.0 + + dataRemovalAnimation = true + dataRemovalAnimationReverse = true + dataRemovalAnimationName = radial-Extract + waitForDataRemoval = false + } +} \ No newline at end of file