Changes for Type-8 update

edr/data/modulenames.json

@@ -46,6 +46,11 @@
 "type7_armour_grade3": { "name":"military grade composite (1I)", "shortname": "Military (1I)"},
 "type7_armour_mirrored": { "name":"mirrored surface composite (1I)", "shortname": "Mirrored (1I)"},
 "type7_armour_reactive": { "name":"reactive surface composite (1I)", "shortname": "Reactive (1I)"},
+"type8_armour_grade1": { "name":"lightweight alloy (1I)", "shortname": "Lightweight (1I)"},
+"type8_armour_grade2": { "name":"reinforced alloy (1I)", "shortname": "Reinforced (1I)"},
+"type8_armour_grade3": { "name":"military grade composite (1I)", "shortname": "Military (1I)"},
+"type8_armour_mirrored": { "name":"mirrored surface composite (1I)", "shortname": "Mirrored (1I)"},
+"type8_armour_reactive": { "name":"reactive surface composite (1I)", "shortname": "Reactive (1I)"},
 "asp_armour_grade1": { "name":"lightweight alloy (1I)", "shortname": "Lightweight (1I)"},
 "asp_armour_grade2": { "name":"reinforced alloy (1I)", "shortname": "Reinforced (1I)"},
 "asp_armour_grade3": { "name":"military grade composite (1I)", "shortname": "Military (1I)"},

edr/data/odyssey_mats.json

@@ -120,7 +120,7 @@
     "ionisedgas": { "upgrades": 28, "type": "item", "locations": ["RES buildings", "PWR buildings", "IND buildings", "EXT buildings", "AGRI buildings", "Mission reward"], "used": 28},
     "compressionliquefiedgas": { "upgrades": 16, "type": "item", "locations": ["RES buildings", "PWR buildings", "IND buildings", "EXT buildings", "AGRI buildings", "Mission reward"], "used": 20},
     "healthmonitor": { "upgrades": 12, "type": "item", "locations": ["MED room", "RES buildings", "HAB buildings", "Mission reward", "Surface crash site"], "used": 12},
-    "largecapacitypowerregulator": { "upgrades": 12, "type": "item", "locations": ["Settlements"], "used": 12},
+    "largecapacitypowerregulator": { "useless": true, "upgrades": 0, "type": "item", "locations": ["Settlements"], "used": 0},
     "suitschematic": { "upgrades": 12, "type": "item", "locations": ["STO buildings", "PWR buildings", "CMD buildings", "Mission reward"], "used": 12},
     "surveillanceequipment": { "blueprints": 3, "type": "item", "locations": ["STO buildings", "EXT buildings", "CMD buildings"], "used": 3, "referer": "Kit Fowler", "refer": "Yarden Bond"},
     "gmeds": { "blueprints": 3, "type": "item", "locations": ["Irregular markers", "MED room", "RES buildings", "CMD buildings", "AGRI buildings", "Settlements", "Mission reward", "Surface crash site"], "used": 3},

edr/data/shipnames.json

@@ -8,6 +8,7 @@
   "type6": "Type-6 Transporter",
   "dolphin": "Dolphin",
   "type7": "Type-7 Transporter",
+  "type8": "Type-8 Transporter",
   "asp": "Asp Explorer",
   "vulture": "Vulture",
   "vulture_taxi": "Vulture Frontlines",

edr/edengineers.py

@@ -38,7 +38,7 @@ def dibs(self, materials):
         if self.progress is None:
             needed["push"] = 5
         if self.progress != "Unlocked":
-            needed["opinionpolls"] = 20
+            needed["opinionpolls"] = 5
         return needed
 
     def relevant(self, material_name):
@@ -63,7 +63,7 @@ def dibs(self, materials):
         if self.progress is None:
             needed["surveillanceequipment"] = 5
         if self.progress != "Unlocked":
-            needed["smearcampaignplans"] = 8
+            needed["smearcampaignplans"] = 5
         return needed
 
     def relevant(self, material_name):
@@ -155,14 +155,14 @@ def dibs(self, materials):
             me = materials.get("multimediaentertainment", 0)
             ce = materials.get("classicentertainment", 0)
             cm = materials.get("catmedia", 0)
-            me = max(min(25, me), 8)
-            ce = max(min(25-me, ce), 25-me-8)
-            cm = 25-me-ce
+            me = max(min(15, me), 5)
+            ce = max(min(15-me, ce), 15-me-5)
+            cm = 15-me-ce
 
             needed = {"multimedia entertainment":me, "classic entertainment":ce, "cat media": cm}
 
         if self.progress is None:
-            needed["settlementdefenceplans"] = 15
+            needed["settlementdefenceplans"] = 5
         return needed
 
     def relevant(self, material_name):

edr/edrfleet.py

@@ -19,6 +19,7 @@ class EDRFleet(object):
         "cobra": "cobramkiii",
         "t6": "type6",
         "t7": "type7",
+        "t8": "type8",
         "t9": "type9",
         "t10": "type9_military",
         "aspx": "asp",

edr/edrinventory.py

@@ -150,7 +150,7 @@
     "unknownorganiccircuitry": {"localized": _(u"Thargoid Organic Circuitry"), "raw": "Thargoid Organic Circuitry", "category": "manufactured", "grade": 5},
     "unknowntechnologycomponents": {"localized": _(u"Thargoid Technological Components"), "raw": "Thargoid Technological Components", "category": "manufactured", "grade": 4},
     "bypass": { "localized": _(u"E-Breach"), "category": "consumable", "raw": "E-Breach", "grade":0},
-    "largecapacitypowerregulator": { "localized": _(u"Power Regulator"), "category": "item", "raw": "Power Regulator", "grade":0, "comments": _("Suits upgrades")},
+    "largecapacitypowerregulator": { "localized": _(u"Power Regulator"), "category": "item", "raw": "Power Regulator", "grade":0},
     "chemicalinventory": { "localized": _(u"Chemical Inventory"), "category": "data", "raw": "Chemical Inventory", "grade":0, "comments": _("Extra backpack")},
     "dutyrota": { "localized": _(u"Duty Rota"), "category": "data", "raw": "Duty Rota", "grade":0},
     "evacuationprotocols": { "localized": _(u"Evacuation Protocols"), "category": "data", "raw": "Evacuation Protocols", "grade":0, "comments": _("Combat movement")},

edr/edvehicles.py

@@ -855,6 +855,17 @@ def __init__(self):
         self.hull_hardness = 54
         self.hull_base_strength = 612 / 1.8
 
+class EDT8Transporter(EDVehicle):
+    def __init__(self):
+        super(EDT8Transporter, self).__init__()
+        self.type = u'Type-8 Transporter'
+        self.size = EDVehicleSize.MEDIUM
+        self.value = 0 # TODO
+        self.shield_base_strength = 122
+        self.hull_mass = 400
+        self.hull_hardness = 54 # TODO
+        self.hull_base_strength = 792 / 1.8
+
 class EDAspExplorer(EDVehicle):
     def __init__(self):
         super(EDAspExplorer, self).__init__()
@@ -1388,6 +1399,7 @@ class EDVehicleFactory(object):
         "type6": EDT6Transporter,
         "dolphin": EDDolphin,
         "type7": EDT7Transporter,
+        "type8": EDT8Transporter,
         "asp": EDAspExplorer,
         "vulture": EDVulture,
         "vulture_taxi": EDVultureFrontlines,