Merge branch 'master' into dep_facelift

eos/saveddata/damagePattern.py

@@ -66,7 +66,7 @@ BUILTINS = OrderedDict([
     (-25, (_c(_t('Condenser Packs')) + _t('SlamBolt'), 23376, 0, 76624, 0)),
     (-26, (_c(_t('Condenser Packs')) + _t('BlastShot'), 19820, 0, 80180, 0)),
     (-27, (_c(_t('Condenser Packs')) + _t('GalvaSurge'), 80206, 0, 19794, 0)),
-    (-28, (_c(_t('Condenser Packs')) + '|' + _t('[T2] ElectroPunch'), 0, 50547, 0, 49453)),
+    (-28, (_c(_t('Condenser Packs')) + '|' + _t('[T2] ElectroPunch'), 50547, 0, 49453, 0)),
 
     (-29, (_c(_t('Hybrid Charges')) + '|' + _t('[T2] Spike'), 0, 4, 4, 0)),
     (-30, (_c(_t('Hybrid Charges')) + '|' + _t('[T2] Null'), 0, 6, 5, 0)),

staticdata/fsd_binary/typedogma.2.json

@@ -338793,7 +338793,7 @@
       }, 
       {
         "attributeID": 633, 
-        "value": 3.0
+        "value": 6.0
       }, 
       {
         "attributeID": 1087, 
@@ -338957,7 +338957,7 @@
       }, 
       {
         "attributeID": 633, 
-        "value": 3.0
+        "value": 6.0
       }, 
       {
         "attributeID": 1087, 
@@ -338991,7 +338991,7 @@
       }, 
       {
         "attributeID": 633, 
-        "value": 3.0
+        "value": 6.0
       }, 
       {
         "attributeID": 1087, 
@@ -339017,7 +339017,7 @@
       }, 
       {
         "attributeID": 633, 
-        "value": 3.0
+        "value": 6.0
       }, 
       {
         "attributeID": 1087, 
@@ -339043,7 +339043,7 @@
       }, 
       {
         "attributeID": 633, 
-        "value": 3.0
+        "value": 6.0
       }, 
       {
         "attributeID": 895, 
@@ -339077,7 +339077,7 @@
       }, 
       {
         "attributeID": 633, 
-        "value": 3.0
+        "value": 6.0
       }, 
       {
         "attributeID": 1087, 
@@ -339123,7 +339123,7 @@
       }, 
       {
         "attributeID": 633, 
-        "value": 3.0
+        "value": 6.0
       }, 
       {
         "attributeID": 1087, 
@@ -339153,7 +339153,7 @@
       }, 
       {
         "attributeID": 633, 
-        "value": 5.0
+        "value": 6.0
       }, 
       {
         "attributeID": 1087, 
@@ -354973,5 +354973,32 @@
         "isDefault": 0
       }
     ]
+  }, 
+  "70895": {
+    "dogmaAttributes": [
+      {
+        "attributeID": 9, 
+        "value": 100000000.0
+      }
+    ], 
+    "dogmaEffects": []
+  }, 
+  "70896": {
+    "dogmaAttributes": [
+      {
+        "attributeID": 9, 
+        "value": 100000000.0
+      }
+    ], 
+    "dogmaEffects": []
+  }, 
+  "70897": {
+    "dogmaAttributes": [
+      {
+        "attributeID": 9, 
+        "value": 100000000.0
+      }
+    ], 
+    "dogmaEffects": []
   }
 }

staticdata/phobos/metadata.0.json

@@ -1,10 +1,10 @@
 [
   {
     "field_name": "client_build", 
-    "field_value": 2072413
+    "field_value": 2073715
   }, 
   {
     "field_name": "dump_time", 
-    "field_value": 1657365659
+    "field_value": 1657653551
   }
 ]