Merge pull request #79 from PorktoberRevolution/science-comms

merge Science/comms parts

Distribution/Restock/GameData/ReStock/Localization/en-us.cfg

@@ -19,6 +19,15 @@ Localization
     #LOC_Restock_variant-mounting_truss = Truss
     #LOC_Restock_variant-mounting_compact = Compact
 
+    #LOC_Restock_variant-antenna_size0 = 0.625m
+    #LOC_Restock_variant-antenna_size1 = 1.25m
+    #LOC_Restock_variant-antenna_truss = Truss
+    #LOC_Restock_variant-antenna_compact = Compact
+    #LOC_Restock_variant-antenna_radial = Radial
+    #LOC_Restock_variant-antenna_radial_reverse = Radial (Reversed)
+    #LOC_Restock_variant-antenna_axial = Axial
+    #LOC_Restock_variant-antenna_axial_reverse = Axial (Reversed)
+
     #LOC_Restock_variant-surface_metal = Metal
 
     #LOC_Restock_variant-service-bay-opaque = Solid Caps

Distribution/Restock/GameData/ReStock/Patches/Communication/restock-antennas.cfg

@@ -0,0 +1,18 @@
+// Patches applying art changes to relay antennas
+// Contents:
+// - Communotron 88-88 (commDish)
+
+// Communotron 88-88 
+@PART[commDish] {
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  MODEL {
+    model = ReStock/Assets/Communication/restock-antenna-radial-5
+  }
+
+  @MODULE[ModuleDeployableAntenna] {
+    @animationName = Deploy
+    @pivotName = Dish
+  }
+}

Distribution/Restock/GameData/ReStock/Patches/Communication/restock-relays.cfg

@@ -0,0 +1,222 @@
+// Patches applying art changes to relay antennas
+// Contents:
+// - HG-5 High Gain Antenna (HighGainAntenna5)
+// - RA-2 Relay Antenna (RelayAntenna5)
+// - RA-15 Relay Antenna (RelayAntenna50)
+// - RA-100 Relay Antenna (RelayAntenna100)
+
+// HG-5 High Gain Antenna
+@PART[HighGainAntenna5] {
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Communication/restock-relay-radial-1
+  }
+
+  @MODULE[ModuleDeployableAntenna] {
+    @animationName = Deploy
+    @pivotName = lower pivot
+  }
+
+  MODULE {
+    name = ModulePartVariants
+    baseVariant = Radial
+
+    VARIANT {
+      name = Radial
+      displayName = #LOC_Restock_variant-antenna_radial
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #707070
+
+      GAMEOBJECTS {
+        arm_radial = true
+        arm_radial_reverse = false
+        arm_axial = false
+        arm_axial_reverse = false
+      }
+    }
+
+    VARIANT {
+      name = Radial_Reverse
+      displayName = #LOC_Restock_variant-antenna_radial_reverse
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #707070
+
+      GAMEOBJECTS {
+        arm_radial = false
+        arm_radial_reverse = true
+        arm_axial = false
+        arm_axial_reverse = false
+      }
+    }
+
+    VARIANT {
+      name = Axial
+      displayName = #LOC_Restock_variant-antenna_axial
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #707070
+
+      GAMEOBJECTS {
+        arm_radial = false
+        arm_radial_reverse = false
+        arm_axial = true
+        arm_axial_reverse = false
+      }
+    }
+
+    VARIANT {
+      name = Axial_Reverse
+      displayName = #LOC_Restock_variant-antenna_axial_reverse
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #707070
+
+      GAMEOBJECTS {
+        arm_radial = false
+        arm_radial_reverse = false
+        arm_axial = false
+        arm_axial_reverse = true
+      }
+    }
+  }
+}
+
+// RA-2 Relay Antenna
+@PART[RelayAntenna5] {
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Communication/restock-relay-stack-1
+  }
+
+   MODULE {
+    name = ModulePartVariants
+    baseVariant = Size0
+
+    VARIANT {
+      name = Size0
+      displayName = #LOC_Restock_variant-antenna_size0
+
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #505050
+
+      GAMEOBJECTS {
+        dish_small_625 = true
+        dish_small_truss = false
+      }
+    }
+
+    VARIANT {
+      name = Truss
+      displayName = #LOC_Restock_variant-antenna_truss
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #707070
+
+      GAMEOBJECTS {
+        dish_small_625 = false
+        dish_small_truss = true
+      }
+    }
+  }
+}
+
+// RA-15 Relay Antenna
+@PART[RelayAntenna50] {
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Communication/restock-relay-stack-2
+  }
+
+   MODULE {
+    name = ModulePartVariants
+    baseVariant = Size0
+
+    VARIANT {
+      name = Size0
+      displayName = #LOC_Restock_variant-antenna_size0
+
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #505050
+
+      GAMEOBJECTS {
+        dish_medium_625 = true
+        dish_medium_125 = false
+      }
+    }
+
+    VARIANT {
+      name = Size1
+      displayName = #LOC_Restock_variant-antenna_size1
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #707070
+
+      GAMEOBJECTS {
+        dish_medium_625 = false
+        dish_medium_125 = true
+      }
+    }
+  }
+}
+
+// RA-100 Relay Antenna
+@PART[RelayAntenna100] {
+  @author = Andrew Cassidy
+
+  !MODEL {}
+  MODEL {
+    model = ReStock/Assets/Communication/restock-relay-stack-3
+  }
+
+   MODULE {
+    name = ModulePartVariants
+    baseVariant = Size1
+
+    VARIANT {
+      name = Size1
+      displayName = #LOC_Restock_variant-antenna_size1
+
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #707070
+
+      GAMEOBJECTS {
+        dish_big_125 = true
+        dish_big_compact = false
+      }
+    }
+
+    VARIANT {
+      name = Compact
+      displayName = #LOC_Restock_variant-antenna_compact
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #707070
+
+      GAMEOBJECTS {
+        dish_big_125 = false
+        dish_big_compact = true
+      }
+    }
+  }
+}

Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg

@@ -6,13 +6,13 @@
 // - Negative Gravioli Detector (sensorGravimeter)
 // - Mystery Goo™ Containment Unit (GooExperiment)
 // - SC-9001 Science Jr. (science_module)
+// - Atmospheric Fluid Spectro-Variometer (sensorAtmosphere)
 
 // Thermometer
 @PART[sensorThermometer] {
   @author = Andrew Cassidy
 
   !mesh = DELETE
-  !MODEL = {}
   MODEL {
     model = ReStock/Assets/Science/restock-thermometer
   }
@@ -23,7 +23,6 @@
   @author = Andrew Cassidy
 
   !mesh = DELETE
-  !MODEL = {}
   MODEL {
     model = ReStock/Assets/Science/restock-barometer
   }
@@ -34,7 +33,6 @@
   @author = Andrew Cassidy
 
   !mesh = DELETE
-  !MODEL = {}
   MODEL {
     model = ReStock/Assets/Science/restock-accelerometer
   }
@@ -45,7 +43,6 @@
   @author = Andrew Cassidy
 
   !mesh = DELETE
-  !MODEL = {}
   MODEL {
     model = ReStock/Assets/Science/restock-gravimeter
   }
@@ -56,7 +53,6 @@
   @author = Andrew Cassidy
 
   !mesh = DELETE
-  !MODEL = {}
   MODEL {
     model = ReStock/Assets/Science/restock-goocanister-radial-1
   }
@@ -100,7 +96,6 @@
   @author = Andrew Cassidy
 
   !mesh = DELETE
-  !MODEL = {}
   MODEL {
     model = ReStock/Assets/Science/restock-materialbay-125-1
   }
@@ -111,4 +106,14 @@
   @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
+}
+
+// Atmospheric Fluid Spectro-Variometer
+@PART[sensorAtmosphere] {
+  @author = Andrew Cassidy
+
+  !mesh = DELETE
+  MODEL {
+    model = ReStock/Assets/Science/restock-GCMS-1
+  }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg

@@ -48,5 +48,9 @@ Localization
     #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
+
+    #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
   }
 }

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Communication/restock-relay-radial-2.cfg

@@ -0,0 +1,129 @@
+// inline goo canister
+PART
+{
+  name = restock-relay-radial-2
+  module = Part
+  author = Andrew Cassidy
+
+  MODEL {
+    model = ReStock/Assets/Communication/restock-relay-radial-2
+  }
+  rescaleFactor = 1.0
+
+  // attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
+  attachRules = 1,1,0,0,0 
+  node_attach = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0, 0
+  node_stack_bottom = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0, 0
+
+  TechRequired = Electrical
+  entryCost = 2000
+  cost = 1000
+  category = Communication
+  subcatagory = 0
+  title = #LOC_RestockPlus_restock-relay-radial-2_title //HG-20 High Gain Antenna
+  description = #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. 
+  mass = 0.18
+  dragModelType = default
+  maximum_drag = 0.3
+  minimum_drag = 0.3
+  angularDrag = 1
+  crashTolerance = 8
+  maxTemp = 2000
+  vesselType = Relay
+  bulkheadProfiles = srf
+  tags = #LOC_RestockPlus_restock-relay-radial-2_tags
+
+  MODULE {
+    name = ModuleDeployableAntenna
+    showStatus = false
+    isTracking = false
+    pivotName = lower pivot
+    windResistance = 1
+    animationName = Deploy
+    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 = RELAY
+    packetInterval = 0.35
+    packetSize = 2
+    packetResourceCost = 40.0
+    requiredResource = ElectricCharge
+    DeployFxModules = 0
+    antennaPower = 20000000
+    antennaCombinable = True
+  }
+  
+  MODULE {
+    name = ModulePartVariants
+    baseVariant = Radial
+
+    VARIANT {
+      name = Radial
+      displayName = #LOC_Restock_variant-antenna_radial
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #707070
+
+      GAMEOBJECTS {
+        arm_radial = true
+        arm_radial_reverse = false
+        arm_axial = false
+        arm_axial_reverse = false
+      }
+    }
+
+    VARIANT {
+      name = Radial_Reverse
+      displayName = #LOC_Restock_variant-antenna_radial_reverse
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #707070
+
+      GAMEOBJECTS {
+        arm_radial = false
+        arm_radial_reverse = true
+        arm_axial = false
+        arm_axial_reverse = false
+      }
+    }
+
+    VARIANT {
+      name = Axial
+      displayName = #LOC_Restock_variant-antenna_axial
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #707070
+
+      GAMEOBJECTS {
+        arm_radial = false
+        arm_radial_reverse = false
+        arm_axial = true
+        arm_axial_reverse = false
+      }
+    }
+
+    VARIANT {
+      name = Axial_Reverse
+      displayName = #LOC_Restock_variant-antenna_axial_reverse
+      themeName = White
+
+      primaryColor = #ffffff
+      secondaryColor = #707070
+
+      GAMEOBJECTS {
+        arm_radial = false
+        arm_radial_reverse = false
+        arm_axial = false
+        arm_axial_reverse = true
+      }
+    }
+  }
+}

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-goocanister-625-1.cfg

@@ -22,7 +22,8 @@ PART
   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
+  manufacturer = #autoLOC_501634 //#autoLOC_501634 = FLOOYD Dynamics Research Labs
+  description = #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

Distribution/RestockPlus/GameData/ReStockPlus/Parts/Science/restock-materialbay-radial-1.cfg

@@ -22,7 +22,8 @@ PART
   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
+  manufacturer = #autoLOC_501644 //#autoLOC_501644 = Experimental Engineering Group
+  description = #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