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
+  }
 }