diff --git a/Assets/CineboxAndrew/Communication/restock-antenna-1-n.psd b/Assets/CineboxAndrew/Communication/restock-antenna-1-n.psd new file mode 100644 index 00000000..14c0f025 Binary files /dev/null and b/Assets/CineboxAndrew/Communication/restock-antenna-1-n.psd differ diff --git a/Assets/CineboxAndrew/Communication/restock-antenna-1-s.psd b/Assets/CineboxAndrew/Communication/restock-antenna-1-s.psd new file mode 100644 index 00000000..d51c04f3 Binary files /dev/null and b/Assets/CineboxAndrew/Communication/restock-antenna-1-s.psd differ diff --git a/Assets/CineboxAndrew/Communication/restock-antenna-1.blend b/Assets/CineboxAndrew/Communication/restock-antenna-1.blend new file mode 100644 index 00000000..d9d8cfd6 Binary files /dev/null and b/Assets/CineboxAndrew/Communication/restock-antenna-1.blend differ diff --git a/Assets/CineboxAndrew/Communication/restock-antenna-1.psd b/Assets/CineboxAndrew/Communication/restock-antenna-1.psd new file mode 100644 index 00000000..1123ef51 Binary files /dev/null and b/Assets/CineboxAndrew/Communication/restock-antenna-1.psd differ diff --git a/Assets/CineboxAndrew/Communication/restock-antenna-3.blend b/Assets/CineboxAndrew/Communication/restock-antenna-3.blend new file mode 100644 index 00000000..1eed434a Binary files /dev/null and b/Assets/CineboxAndrew/Communication/restock-antenna-3.blend differ diff --git a/Assets/CineboxAndrew/Communication/restock-antennas-1.blend b/Assets/CineboxAndrew/Communication/restock-antenna-4.blend similarity index 62% rename from Assets/CineboxAndrew/Communication/restock-antennas-1.blend rename to Assets/CineboxAndrew/Communication/restock-antenna-4.blend index 1545c2de..c349dbb3 100644 Binary files a/Assets/CineboxAndrew/Communication/restock-antennas-1.blend and b/Assets/CineboxAndrew/Communication/restock-antenna-4.blend differ diff --git a/Assets/CineboxAndrew/Communication/restock-antenna-5-n.psd b/Assets/CineboxAndrew/Communication/restock-antenna-5-n.psd deleted file mode 100644 index 845ec2f6..00000000 Binary files a/Assets/CineboxAndrew/Communication/restock-antenna-5-n.psd and /dev/null differ diff --git a/Assets/CineboxAndrew/Communication/restock-antenna-5-s.psd b/Assets/CineboxAndrew/Communication/restock-antenna-5-s.psd deleted file mode 100644 index 3274e8cb..00000000 Binary files a/Assets/CineboxAndrew/Communication/restock-antenna-5-s.psd and /dev/null differ diff --git a/Assets/CineboxAndrew/Communication/restock-antenna-5.psd b/Assets/CineboxAndrew/Communication/restock-antenna-5.psd deleted file mode 100644 index 84618b22..00000000 Binary files a/Assets/CineboxAndrew/Communication/restock-antenna-5.psd and /dev/null differ diff --git a/Assets/CineboxAndrew/Communication/restock-antenna-foil-n.psd b/Assets/CineboxAndrew/Communication/restock-antenna-foil-n.psd new file mode 100644 index 00000000..fba05241 Binary files /dev/null and b/Assets/CineboxAndrew/Communication/restock-antenna-foil-n.psd differ diff --git a/Assets/CineboxAndrew/Communication/restock-antenna-foil-s.psd b/Assets/CineboxAndrew/Communication/restock-antenna-foil-s.psd new file mode 100644 index 00000000..f2602823 Binary files /dev/null and b/Assets/CineboxAndrew/Communication/restock-antenna-foil-s.psd differ diff --git a/Assets/CineboxAndrew/Communication/restock-antenna-foil.psd b/Assets/CineboxAndrew/Communication/restock-antenna-foil.psd new file mode 100644 index 00000000..eff395cc Binary files /dev/null and b/Assets/CineboxAndrew/Communication/restock-antenna-foil.psd differ diff --git a/Assets/CineboxAndrew/Communication/restock-antenna-radial-2.blend b/Assets/CineboxAndrew/Communication/restock-antenna-radial-2.blend new file mode 100644 index 00000000..e2226ac7 Binary files /dev/null and b/Assets/CineboxAndrew/Communication/restock-antenna-radial-2.blend differ diff --git a/Assets/CineboxAndrew/Communication/restock-antenna-stack-2.blend b/Assets/CineboxAndrew/Communication/restock-antenna-stack-2.blend new file mode 100644 index 00000000..bf3dfded Binary files /dev/null and b/Assets/CineboxAndrew/Communication/restock-antenna-stack-2.blend differ diff --git a/Assets/CineboxAndrew/Communication/restock-relays-1-n.psd b/Assets/CineboxAndrew/Communication/restock-relay-1-n.psd similarity index 100% rename from Assets/CineboxAndrew/Communication/restock-relays-1-n.psd rename to Assets/CineboxAndrew/Communication/restock-relay-1-n.psd diff --git a/Assets/CineboxAndrew/Communication/restock-relays-1-s.psd b/Assets/CineboxAndrew/Communication/restock-relay-1-s.psd similarity index 100% rename from Assets/CineboxAndrew/Communication/restock-relays-1-s.psd rename to Assets/CineboxAndrew/Communication/restock-relay-1-s.psd diff --git a/Assets/CineboxAndrew/Communication/restock-relays-1.psd b/Assets/CineboxAndrew/Communication/restock-relay-1.psd similarity index 98% rename from Assets/CineboxAndrew/Communication/restock-relays-1.psd rename to Assets/CineboxAndrew/Communication/restock-relay-1.psd index ce5ab397..c827d887 100644 Binary files a/Assets/CineboxAndrew/Communication/restock-relays-1.psd and b/Assets/CineboxAndrew/Communication/restock-relay-1.psd differ diff --git a/Assets/CineboxAndrew/Communication/restock-relays-1.blend b/Assets/CineboxAndrew/Communication/restock-relays.blend similarity index 100% rename from Assets/CineboxAndrew/Communication/restock-relays-1.blend rename to Assets/CineboxAndrew/Communication/restock-relays.blend diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-1-n.dds new file mode 100644 index 00000000..38737456 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-1.dds new file mode 100644 index 00000000..c428a10e Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-5-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-5-n.tga deleted file mode 100644 index 1a2c7ed3..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-5-n.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-5.tga b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-5.tga deleted file mode 100644 index 4f209157..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-5.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-foil-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-foil-n.dds new file mode 100644 index 00000000..48978b06 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-foil-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-foil-s.dds b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-foil-s.dds new file mode 100644 index 00000000..9f119cc2 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-foil-s.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-foil.dds b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-foil.dds new file mode 100644 index 00000000..6e669d78 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-foil.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-1.mu new file mode 100644 index 00000000..ff690115 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-2.mu new file mode 100644 index 00000000..51d03cc8 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-3.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-3.mu new file mode 100644 index 00000000..f9dba787 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-3.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-1.mu new file mode 100644 index 00000000..b7e7f231 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-2.mu new file mode 100644 index 00000000..3944c411 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-2.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-3.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-3.mu new file mode 100644 index 00000000..739fdb34 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-3.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-5.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-4.mu similarity index 75% rename from Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-5.mu rename to Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-4.mu index 58587c5a..fdce5e48 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-radial-5.mu and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-antenna-stack-4.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-1-n.dds new file mode 100644 index 00000000..a8f60c4f Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-1-n.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-1.dds new file mode 100644 index 00000000..8c0748f2 Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-1.dds differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-1.mu index 0dad3508..516fa901 100644 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relay-radial-1.mu differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relays-1-n.tga b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relays-1-n.tga deleted file mode 100644 index 42cc4589..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relays-1-n.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relays-1.tga b/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relays-1.tga deleted file mode 100644 index 96b738e3..00000000 Binary files a/Distribution/Restock/GameData/ReStock/Assets/Communication/restock-relays-1.tga and /dev/null differ diff --git a/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg b/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg index 7db0f05a..72a61778 100644 --- a/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg +++ b/Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg @@ -1,18 +1,112 @@ // Patches applying art changes to relay antennas // Contents: +// - Communotron 16 (longAntenna) +// - Communotron 16-S (surfAntenna) +// - Communotron HG-55 (mediumDishAntenna) +// - Communotron HG-55 (HighGainAntenna) // - Communotron 88-88 (commDish) +// Communotron 16 +@PART[longAntenna] { + @author = Andrew Cassidy + + !mesh = DELETE + MODEL { + model = ReStock/Assets/Communication/restock-antenna-stack-1 + } + + @MODULE[ModuleDeployableAntenna] { + @animationName = Deploy + @pivotName = Segment_1 + } +} + +// Communotron 16-S +@PART[SurfAntenna] { + @author = Andrew Cassidy + + !MODEL {} + MODEL { + model = ReStock/Assets/Communication/restock-antenna-radial-1 + } +} + +// Communotron DTS-M1 +@PART[mediumDishAntenna] { + @author = Andrew Cassidy + + !mesh = DELETE + MODEL { + model = ReStock/Assets/Communication/restock-antenna-radial-2 + } + + @MODULE[ModuleDeployableAntenna] { + @animationName = Deploy + @pivotName = Dish + !raycastTransformName = DELETE + } +} + +// Communotron HG-55 +@PART[HighGainAntenna] { + @author = Andrew Cassidy + + !MODEL {} + MODEL { + model = ReStock/Assets/Communication/restock-antenna-radial-3 + } + + @MODULE[ModuleDeployableAntenna] { + @animationName = Deploy_Radial + @pivotName = Dish_Radial + !secondaryTransformName = DELETE + } + + MODULE { + name = ModulePartVariants + baseVariant = Axial + + VARIANT { + name = Radial + displayName = #LOC_Restock_variant-antenna_radial + themeName = Gold + + primaryColor = #fccb0a + secondaryColor = #707070 + + GAMEOBJECTS { + Dish_Normal = true + Dish_Axial = false + } + } + + VARIANT { + name = Axial + displayName = #LOC_Restock_variant-antenna_axial + themeName = Gold + + primaryColor = #fccb0a + secondaryColor = #707070 + + GAMEOBJECTS { + Dish_Normal = false + Dish_Axial = true + } + } + } +} + // Communotron 88-88 @PART[commDish] { @author = Andrew Cassidy !mesh = DELETE MODEL { - model = ReStock/Assets/Communication/restock-antenna-radial-5 + model = ReStock/Assets/Communication/restock-antenna-stack-4 } @MODULE[ModuleDeployableAntenna] { @animationName = Deploy @pivotName = Dish } -} \ No newline at end of file +} diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg index 0aba6100..b4eaef71 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg @@ -155,5 +155,13 @@ Localization #LOC_RestockPlus_restock-relay-radial-2_title = HG-20 High Gain Antenna #LOC_RestockPlus_restock-relay-radial-2_description = A longer range version of the HG-5 that can handle either direct communications or short range relays, using 4 different dishes. #LOC_RestockPlus_restock-relay-radial-2_tags = relay antenna radial science transmit data Apollo restock + + #LOC_RestockPlus_restock-antenna-stack-2_title = Communotron DTS-J1 + #LOC_RestockPlus_restock-antenna-stack-2_description = A fixed mount version of the popular DTS-M1 antenna. this version is a more traditional dish, giving it better efficiency at the expense of higher mass. + #LOC_RestockPlus_restock-antenna-stack-2_tags = antenna radial transmit data dish Juno restock + + #LOC_RestockPlus_restock-antenna-stack-3_title = Communotron HG-89 + #LOC_RestockPlus_restock-antenna-stack-3_description = After developing the venerable HG-55, one of our marketing people came up with the idea of a budget version for small probes. The HG-89 removes the fancy extending arm, while still providing the same great communication range of its predecessor, making it perfect for building deep space probes on a budget. + #LOC_RestockPlus_restock-antenna-stack-3_tags = antenna radial transmit data dish Galileo TDRS restock } } diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-antenna-stack-2.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-antenna-stack-2.cfg new file mode 100644 index 00000000..f590a349 --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-antenna-stack-2.cfg @@ -0,0 +1,76 @@ +// stack-mount small direct antenna +PART +{ + name = restock-antenna-stack-2 + module = Part + author = Andrew Cassidy + + MODEL { + model = ReStock/Assets/Communication/restock-antenna-stack-2 + } + rescaleFactor = 1.0 + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,1,0,0,0 + node_attach = 0.0, -0.1, 0.0, 0.0, -1.0, 0.0, 0 + node_stack_bottom = 0.0, -0.125, 0.0, 0.0, -1.0, 0.0, 0 + + TechRequired = precisionEngineering + entryCost = 4700 + cost = 900 + category = Communication + subcatagory = 0 + title = #LOC_RestockPlus_restock-antenna-stack-2_title //Communotron DTS-J1 + description = #LOC_RestockPlus_restock-antenna-stack-2_description + // A fixed mount version of the popular DTS-M1 antenna. this version is a more traditional dish, giving it better efficiency at the expense of higher mass. + mass = 0.04 + dragModelType = default + maximum_drag = 0.3 + minimum_drag = 0.3 + angularDrag = 1 + crashTolerance = 10 + maxTemp = 1800 + bulkheadProfiles = srf, size0 + tags = #LOC_RestockPlus_restock-antenna-stack-2_tags + + MODULE { + name = ModuleDataTransmitter + antennaType = DIRECT + packetInterval = 0.35 + packetSize = 2 + packetResourceCost = 10.0 + requiredResource = ElectricCharge + antennaPower = 2000000000 + antennaCombinable = True + } + + MODULE + { + name = ModulePartVariants + baseVariant = Gold + VARIANT + { + name = Gold + displayName = #LOC_Restock_variant-probe-gold + themeName = Gold + primaryColor = #fccb0a + GAMEOBJECTS + { + foil_gold = true + foil_silver = false + } + } + VARIANT + { + name = Silver + displayName = #LOC_Restock_variant-probe-silver + themeName = Silver + primaryColor = #cecece + GAMEOBJECTS + { + foil_gold = false + foil_silver = true + } + } + } +} \ No newline at end of file diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-antenna-stack-3.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-antenna-stack-3.cfg new file mode 100644 index 00000000..f1c3981a --- /dev/null +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-antenna-stack-3.cfg @@ -0,0 +1,59 @@ +// stack-mount medium direct antenna +PART +{ + name = restock-antenna-stack-3 + module = Part + author = Andrew Cassidy + + MODEL { + model = ReStock/Assets/Communication/restock-antenna-stack-3 + } + rescaleFactor = 1.0 + + // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision + attachRules = 1,1,0,0,0 + node_attach = 0.0, -0.01, 0.0, 0.0, -1.0, 0.0, 0 + node_stack_bottom = 0.0, -0.004736, 0.0, 0.0, -1.0, 0.0, 0 + + category = Communication + TechRequired = electronics + entryCost = 7500 + cost = 999 + subcatagory = 0 + title = #LOC_RestockPlus_restock-antenna-stack-3_title //Communotron HG-89 + manufacturer = #autoLOC_501635 //#autoLOC_501635 = Ionic Symphonic Protonic Electronics + description = #LOC_RestockPlus_restock-antenna-stack-3_description + // After developing the venerable HG-55, one of our marketing people came up with the idea of a budget version for small probes. The HG-89 removes the fancy extending arm, while still providing the same great communication range of its predecessor, making it perfect for building deep space probes on a budget. + mass = 0.06 + dragModelType = default + maximum_drag = 0.3 + minimum_drag = 0.3 + angularDrag = 1 + crashTolerance = 8 + maxTemp = 1800 + bulkheadProfiles = srf, size0 + tags = #LOC_RestockPlus_restock-antenna-stack-3_tags + + MODULE { + name = ModuleDeployableAntenna + showStatus = false + isTracking = false + pivotName = Dish_Stack + animationName = Deploy_Stack + extendActionName = #autoLOC_6002398 //#autoLOC_6002398 = Extend <<1>> + retractActionName = #autoLOC_6002399 //#autoLOC_6002399 = Retract <<1>> + extendpanelsActionName = #autoLOC_6002400 //#autoLOC_6002400 = Toggle <<1>> + } + + MODULE { + name = ModuleDataTransmitter + antennaType = DIRECT + packetInterval = 0.15 + packetSize = 3 + packetResourceCost = 20.0 + DeployFxModules = 0 + requiredResource = ElectricCharge + antennaPower = 15000000000 + antennaCombinable = True + } +} \ No newline at end of file diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-relay-radial-2.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-relay-radial-2.cfg index 841d5ba6..6814887c 100644 --- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-relay-radial-2.cfg +++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-relay-radial-2.cfg @@ -1,4 +1,4 @@ -// inline goo canister +// 4x radial relay antenna PART { name = restock-relay-radial-2