diff --git a/coriolis-data b/coriolis-data index 35473b30..e9417ea4 160000 --- a/coriolis-data +++ b/coriolis-data @@ -1 +1 @@ -Subproject commit 35473b30d391975dc4a00e0ab2dc0e8611cce268 +Subproject commit e9417ea417690006db18ab649ed6f2384ea12416 diff --git a/coriolis.py b/coriolis.py index d2a156e9..0be49081 100755 --- a/coriolis.py +++ b/coriolis.py @@ -14,12 +14,20 @@ import companion if __name__ == "__main__": + + def add(modules, name, attributes): + assert name not in modules or modules[name] == attributes, '%s: %s!=%s' % (name, modules.get(name), attributes) + assert name not in modules, name + modules[name] = attributes + + data = json.load(open('coriolis-data/dist/index.json')) # Map Coriolis's names to names displayed in the in-game shipyard coriolis_ship_map = { 'Cobra Mk III' : 'Cobra MkIII', 'Cobra Mk IV' : 'Cobra MkIV', + 'Krait Mk II' : 'Krait MkII', 'Viper' : 'Viper MkIII', 'Viper Mk IV' : 'Viper MkIV', } @@ -66,33 +74,32 @@ if __name__ == "__main__": modules[key] = { 'mass': m.get('mass', 0) } # Some modules don't have mass # 3.0 / 3.1 additions not yet present in coriolis-data - for k in modules.keys(): - if k.startswith('int_hullreinforcement_'): - modules['int_guardianhullreinforcement_' + k[22:]] = modules[k] - modules['int_metaalloyhullreinforcement_' + k[22:]] = modules[k] - modules['int_guardianmodulereinforcement_' + k[22:]] = modules[k] - modules['hpt_causticmissile_fixed_medium'] = {'mass': 4} - modules['hpt_flechettelauncher_fixed_medium'] = {'mass': 4} - modules['hpt_flechettelauncher_turret_medium'] = {'mass': 4} - modules['hpt_guardian_plasmalauncher_fixed_medium'] = {'mass': 4} - modules['hpt_guardian_plasmalauncher_fixed_large'] = {'mass': 8} - modules['hpt_guardian_plasmalauncher_turret_medium'] = {'mass': 4} - modules['hpt_guardian_plasmalauncher_turret_large'] = {'mass': 8} - modules['hpt_guardian_shardcannon_fixed_medium'] = {'mass': 4} - modules['hpt_guardian_shardcannon_fixed_large'] = {'mass': 8} - modules['hpt_guardian_shardcannon_turret_medium'] = {'mass': 4} - modules['hpt_guardian_shardcannon_turret_large'] = {'mass': 8} - modules['hpt_plasmashockcannon_fixed_medium'] = {'mass': 4} - modules['hpt_plasmashockcannon_fixed_large'] = {'mass': 8} # ??? - modules['hpt_plasmashockcannon_gimbal_medium'] = {'mass': 4} - modules['hpt_plasmashockcannon_gimbal_large'] = {'mass': 8} # ??? - modules['hpt_plasmashockcannon_turret_medium'] = {'mass': 4} - modules['hpt_plasmashockcannon_turret_large'] = {'mass': 8} # ??? - modules['int_dronecontrol_decontamination_size1_class1'] = {'mass': 1.3} - modules['int_dronecontrol_decontamination_size3_class1'] = {'mass': 2} - modules['int_dronecontrol_decontamination_size5_class1'] = {'mass': 20} - modules['int_dronecontrol_decontamination_size7_class1'] = {'mass': 128} - modules['int_dronecontrol_unkvesselresearch'] = {'mass': 1.3} + add(modules, 'hpt_causticmissile_fixed_medium', {'mass': 4}) + add(modules, 'hpt_flechettelauncher_fixed_medium', {'mass': 4}) + add(modules, 'hpt_flechettelauncher_turret_medium', {'mass': 4}) + add(modules, 'hpt_guardian_plasmalauncher_fixed_large', {'mass': 8}) + add(modules, 'hpt_guardian_plasmalauncher_turret_large', {'mass': 8}) + add(modules, 'hpt_guardian_shardcannon_turret_medium', {'mass': 4}) + add(modules, 'hpt_guardian_shardcannon_turret_large', {'mass': 8}) + add(modules, 'hpt_plasmashockcannon_fixed_medium', {'mass': 4}) + add(modules, 'hpt_plasmashockcannon_gimbal_large', {'mass': 8}) # ??? + add(modules, 'hpt_plasmashockcannon_turret_medium', {'mass': 4}) + add(modules, 'hpt_plasmashockcannon_turret_large', {'mass': 8}) # ??? + add(modules, 'int_dronecontrol_decontamination_size1_class1', {'mass': 1.3}) + add(modules, 'int_dronecontrol_decontamination_size3_class1', {'mass': 2}) + add(modules, 'int_dronecontrol_decontamination_size5_class1', {'mass': 20}) + add(modules, 'int_dronecontrol_decontamination_size7_class1', {'mass': 128}) + add(modules, 'int_dronecontrol_unkvesselresearch', {'mass': 1.3}) + add(modules, 'int_metaalloyhullreinforcement_size1_class1', { 'mass': 2 }) + add(modules, 'int_metaalloyhullreinforcement_size1_class2', { 'mass': 2 }) # anomaly + add(modules, 'int_metaalloyhullreinforcement_size2_class1', { 'mass': 4 }) + add(modules, 'int_metaalloyhullreinforcement_size2_class2', { 'mass': 2 }) + add(modules, 'int_metaalloyhullreinforcement_size3_class1', { 'mass': 8 }) + add(modules, 'int_metaalloyhullreinforcement_size3_class2', { 'mass': 4 }) + add(modules, 'int_metaalloyhullreinforcement_size4_class1', { 'mass': 16 }) + add(modules, 'int_metaalloyhullreinforcement_size4_class2', { 'mass': 8 }) + add(modules, 'int_metaalloyhullreinforcement_size5_class1', { 'mass': 32 }) + add(modules, 'int_metaalloyhullreinforcement_size5_class2', { 'mass': 16 }) modules = OrderedDict([(k,modules[k]) for k in sorted(modules)]) # sort for easier diffing cPickle.dump(modules, open('modules.p', 'wb')) diff --git a/modules.p b/modules.p index 4c19628a..ac249bf3 100644 --- a/modules.p +++ b/modules.p @@ -2300,7 +2300,7 @@ S'int_dronecontrol_resourcesiphon_size7_class5' p1151 a(dp1152 g6 -I90 +I80 saa(lp1153 S'int_dronecontrol_unkvesselresearch' p1154 @@ -3059,3166 +3059,3226 @@ I16 saa(lp1526 S'int_guardianmodulereinforcement_size1_class1' p1527 -ag1498 -aa(lp1528 -S'int_guardianmodulereinforcement_size1_class2' -p1529 -ag1501 -aa(lp1530 -S'int_guardianmodulereinforcement_size2_class1' -p1531 -ag1504 -aa(lp1532 -S'int_guardianmodulereinforcement_size2_class2' -p1533 -ag1507 -aa(lp1534 -S'int_guardianmodulereinforcement_size3_class1' -p1535 -ag1510 -aa(lp1536 -S'int_guardianmodulereinforcement_size3_class2' -p1537 -ag1513 -aa(lp1538 -S'int_guardianmodulereinforcement_size4_class1' -p1539 -ag1516 -aa(lp1540 -S'int_guardianmodulereinforcement_size4_class2' -p1541 -ag1519 -aa(lp1542 -S'int_guardianmodulereinforcement_size5_class1' -p1543 -ag1522 -aa(lp1544 -S'int_guardianmodulereinforcement_size5_class2' -p1545 -ag1525 -aa(lp1546 -S'int_guardianpowerdistributor_size1' -p1547 -a(dp1548 -g6 -F1.3999999999999999 -saa(lp1549 -S'int_guardianpowerdistributor_size2' -p1550 -a(dp1551 -g6 -F2.6000000000000001 -saa(lp1552 -S'int_guardianpowerdistributor_size3' -p1553 -a(dp1554 -g6 -F5.25 -saa(lp1555 -S'int_guardianpowerdistributor_size4' -p1556 -a(dp1557 -g6 -F10.5 -saa(lp1558 -S'int_guardianpowerdistributor_size5' -p1559 -a(dp1560 -g6 -I21 -saa(lp1561 -S'int_guardianpowerdistributor_size6' -p1562 -a(dp1563 -g6 -I42 -saa(lp1564 -S'int_guardianpowerdistributor_size7' -p1565 -a(dp1566 -g6 -I84 -saa(lp1567 -S'int_guardianpowerdistributor_size8' -p1568 -a(dp1569 -g6 -I168 -saa(lp1570 -S'int_guardianpowerplant_size2' -p1571 -a(dp1572 -g6 -F1.5 -saa(lp1573 -S'int_guardianpowerplant_size3' -p1574 -a(dp1575 -g6 -F2.8999999999999999 -saa(lp1576 -S'int_guardianpowerplant_size4' -p1577 -a(dp1578 -g6 -F5.9000000000000004 -saa(lp1579 -S'int_guardianpowerplant_size5' -p1580 -a(dp1581 -g6 -F11.699999999999999 -saa(lp1582 -S'int_guardianpowerplant_size6' -p1583 -a(dp1584 -g6 -F23.399999999999999 -saa(lp1585 -S'int_guardianpowerplant_size7' -p1586 -a(dp1587 -g6 -F46.799999999999997 -saa(lp1588 -S'int_guardianpowerplant_size8' -p1589 -a(dp1590 -g6 -F93.599999999999994 -saa(lp1591 -S'int_guardianshieldreinforcement_size1_class1' -p1592 -a(dp1593 +a(dp1528 g6 I2 -saa(lp1594 -S'int_guardianshieldreinforcement_size1_class2' -p1595 -a(dp1596 +saa(lp1529 +S'int_guardianmodulereinforcement_size1_class2' +p1530 +a(dp1531 g6 I1 -saa(lp1597 -S'int_guardianshieldreinforcement_size2_class1' -p1598 -a(dp1599 +saa(lp1532 +S'int_guardianmodulereinforcement_size2_class1' +p1533 +a(dp1534 g6 I4 -saa(lp1600 -S'int_guardianshieldreinforcement_size2_class2' -p1601 -a(dp1602 +saa(lp1535 +S'int_guardianmodulereinforcement_size2_class2' +p1536 +a(dp1537 g6 I2 -saa(lp1603 -S'int_guardianshieldreinforcement_size3_class1' -p1604 -a(dp1605 +saa(lp1538 +S'int_guardianmodulereinforcement_size3_class1' +p1539 +a(dp1540 g6 I8 -saa(lp1606 -S'int_guardianshieldreinforcement_size3_class2' -p1607 -a(dp1608 +saa(lp1541 +S'int_guardianmodulereinforcement_size3_class2' +p1542 +a(dp1543 g6 I4 -saa(lp1609 -S'int_guardianshieldreinforcement_size4_class1' -p1610 -a(dp1611 +saa(lp1544 +S'int_guardianmodulereinforcement_size4_class1' +p1545 +a(dp1546 g6 I16 -saa(lp1612 -S'int_guardianshieldreinforcement_size4_class2' -p1613 -a(dp1614 +saa(lp1547 +S'int_guardianmodulereinforcement_size4_class2' +p1548 +a(dp1549 g6 I8 -saa(lp1615 -S'int_guardianshieldreinforcement_size5_class1' -p1616 -a(dp1617 +saa(lp1550 +S'int_guardianmodulereinforcement_size5_class1' +p1551 +a(dp1552 g6 I32 -saa(lp1618 -S'int_guardianshieldreinforcement_size5_class2' -p1619 -a(dp1620 +saa(lp1553 +S'int_guardianmodulereinforcement_size5_class2' +p1554 +a(dp1555 g6 I16 -saa(lp1621 -S'int_hullreinforcement_size1_class1' -p1622 -ag1498 -aa(lp1623 -S'int_hullreinforcement_size1_class2' -p1624 -ag1501 -aa(lp1625 -S'int_hullreinforcement_size2_class1' +saa(lp1556 +S'int_guardianpowerdistributor_size1' +p1557 +a(dp1558 +g6 +F1.3999999999999999 +saa(lp1559 +S'int_guardianpowerdistributor_size2' +p1560 +a(dp1561 +g6 +F2.6000000000000001 +saa(lp1562 +S'int_guardianpowerdistributor_size3' +p1563 +a(dp1564 +g6 +F5.25 +saa(lp1565 +S'int_guardianpowerdistributor_size4' +p1566 +a(dp1567 +g6 +F10.5 +saa(lp1568 +S'int_guardianpowerdistributor_size5' +p1569 +a(dp1570 +g6 +I21 +saa(lp1571 +S'int_guardianpowerdistributor_size6' +p1572 +a(dp1573 +g6 +I42 +saa(lp1574 +S'int_guardianpowerdistributor_size7' +p1575 +a(dp1576 +g6 +I84 +saa(lp1577 +S'int_guardianpowerdistributor_size8' +p1578 +a(dp1579 +g6 +I168 +saa(lp1580 +S'int_guardianpowerplant_size2' +p1581 +a(dp1582 +g6 +F1.5 +saa(lp1583 +S'int_guardianpowerplant_size3' +p1584 +a(dp1585 +g6 +F2.8999999999999999 +saa(lp1586 +S'int_guardianpowerplant_size4' +p1587 +a(dp1588 +g6 +F5.9000000000000004 +saa(lp1589 +S'int_guardianpowerplant_size5' +p1590 +a(dp1591 +g6 +F11.699999999999999 +saa(lp1592 +S'int_guardianpowerplant_size6' +p1593 +a(dp1594 +g6 +F23.399999999999999 +saa(lp1595 +S'int_guardianpowerplant_size7' +p1596 +a(dp1597 +g6 +F46.799999999999997 +saa(lp1598 +S'int_guardianpowerplant_size8' +p1599 +a(dp1600 +g6 +F93.599999999999994 +saa(lp1601 +S'int_guardianshieldreinforcement_size1_class1' +p1602 +a(dp1603 +g6 +I2 +saa(lp1604 +S'int_guardianshieldreinforcement_size1_class2' +p1605 +a(dp1606 +g6 +I1 +saa(lp1607 +S'int_guardianshieldreinforcement_size2_class1' +p1608 +a(dp1609 +g6 +I4 +saa(lp1610 +S'int_guardianshieldreinforcement_size2_class2' +p1611 +a(dp1612 +g6 +I2 +saa(lp1613 +S'int_guardianshieldreinforcement_size3_class1' +p1614 +a(dp1615 +g6 +I8 +saa(lp1616 +S'int_guardianshieldreinforcement_size3_class2' +p1617 +a(dp1618 +g6 +I4 +saa(lp1619 +S'int_guardianshieldreinforcement_size4_class1' +p1620 +a(dp1621 +g6 +I16 +saa(lp1622 +S'int_guardianshieldreinforcement_size4_class2' +p1623 +a(dp1624 +g6 +I8 +saa(lp1625 +S'int_guardianshieldreinforcement_size5_class1' p1626 -ag1504 -aa(lp1627 -S'int_hullreinforcement_size2_class2' -p1628 -ag1507 -aa(lp1629 -S'int_hullreinforcement_size3_class1' -p1630 -ag1510 -aa(lp1631 -S'int_hullreinforcement_size3_class2' +a(dp1627 +g6 +I32 +saa(lp1628 +S'int_guardianshieldreinforcement_size5_class2' +p1629 +a(dp1630 +g6 +I16 +saa(lp1631 +S'int_hullreinforcement_size1_class1' p1632 -ag1513 -aa(lp1633 -S'int_hullreinforcement_size4_class1' -p1634 -ag1516 -aa(lp1635 -S'int_hullreinforcement_size4_class2' -p1636 -ag1519 -aa(lp1637 -S'int_hullreinforcement_size5_class1' +a(dp1633 +g6 +I2 +saa(lp1634 +S'int_hullreinforcement_size1_class2' +p1635 +a(dp1636 +g6 +I1 +saa(lp1637 +S'int_hullreinforcement_size2_class1' p1638 -ag1522 -aa(lp1639 -S'int_hullreinforcement_size5_class2' -p1640 -ag1525 -aa(lp1641 -S'int_hyperdrive_size2_class1' -p1642 -a(dp1643 -S'optmass' +a(dp1639 +g6 +I4 +saa(lp1640 +S'int_hullreinforcement_size2_class2' +p1641 +a(dp1642 +g6 +I2 +saa(lp1643 +S'int_hullreinforcement_size3_class1' p1644 +a(dp1645 +g6 +I8 +saa(lp1646 +S'int_hullreinforcement_size3_class2' +p1647 +a(dp1648 +g6 +I4 +saa(lp1649 +S'int_hullreinforcement_size4_class1' +p1650 +a(dp1651 +g6 +I16 +saa(lp1652 +S'int_hullreinforcement_size4_class2' +p1653 +a(dp1654 +g6 +I8 +saa(lp1655 +S'int_hullreinforcement_size5_class1' +p1656 +a(dp1657 +g6 +I32 +saa(lp1658 +S'int_hullreinforcement_size5_class2' +p1659 +a(dp1660 +g6 +I16 +saa(lp1661 +S'int_hyperdrive_size2_class1' +p1662 +a(dp1663 +S'optmass' +p1664 I48 sS'fuelmul' -p1645 +p1665 F0.010999999999999999 sg6 F2.5 sS'maxfuel' -p1646 +p1666 F0.59999999999999998 sS'fuelpower' -p1647 +p1667 I2 -saa(lp1648 +saa(lp1668 S'int_hyperdrive_size2_class2' -p1649 -a(dp1650 -g1644 +p1669 +a(dp1670 +g1664 I54 -sg1645 +sg1665 F0.01 sg6 I1 -sg1646 +sg1666 F0.59999999999999998 -sg1647 +sg1667 I2 -saa(lp1651 +saa(lp1671 S'int_hyperdrive_size2_class3' -p1652 -a(dp1653 -g1644 +p1672 +a(dp1673 +g1664 I60 -sg1645 +sg1665 F0.0080000000000000002 sg6 F2.5 -sg1646 +sg1666 F0.59999999999999998 -sg1647 +sg1667 I2 -saa(lp1654 +saa(lp1674 S'int_hyperdrive_size2_class4' -p1655 -a(dp1656 -g1644 +p1675 +a(dp1676 +g1664 I75 -sg1645 +sg1665 F0.01 sg6 I4 -sg1646 +sg1666 F0.80000000000000004 -sg1647 +sg1667 I2 -saa(lp1657 +saa(lp1677 S'int_hyperdrive_size2_class5' -p1658 -a(dp1659 -g1644 +p1678 +a(dp1679 +g1664 I90 -sg1645 +sg1665 F0.012 sg6 F2.5 -sg1646 +sg1666 F0.90000000000000002 -sg1647 +sg1667 I2 -saa(lp1660 +saa(lp1680 S'int_hyperdrive_size3_class1' -p1661 -a(dp1662 -g1644 +p1681 +a(dp1682 +g1664 I80 -sg1645 +sg1665 F0.010999999999999999 sg6 I5 -sg1646 +sg1666 F1.2 -sg1647 +sg1667 F2.1499999999999999 -saa(lp1663 +saa(lp1683 S'int_hyperdrive_size3_class2' -p1664 -a(dp1665 -g1644 +p1684 +a(dp1685 +g1664 I90 -sg1645 +sg1665 F0.01 sg6 I2 -sg1646 +sg1666 F1.2 -sg1647 +sg1667 F2.1499999999999999 -saa(lp1666 +saa(lp1686 S'int_hyperdrive_size3_class3' -p1667 -a(dp1668 -g1644 +p1687 +a(dp1688 +g1664 I100 -sg1645 +sg1665 F0.0080000000000000002 sg6 I5 -sg1646 +sg1666 F1.2 -sg1647 +sg1667 F2.1499999999999999 -saa(lp1669 +saa(lp1689 S'int_hyperdrive_size3_class4' -p1670 -a(dp1671 -g1644 +p1690 +a(dp1691 +g1664 I125 -sg1645 +sg1665 F0.01 sg6 I8 -sg1646 +sg1666 F1.5 -sg1647 +sg1667 F2.1499999999999999 -saa(lp1672 +saa(lp1692 S'int_hyperdrive_size3_class5' -p1673 -a(dp1674 -g1644 +p1693 +a(dp1694 +g1664 I150 -sg1645 +sg1665 F0.012 sg6 I5 -sg1646 +sg1666 F1.8 -sg1647 +sg1667 F2.1499999999999999 -saa(lp1675 +saa(lp1695 S'int_hyperdrive_size4_class1' -p1676 -a(dp1677 -g1644 +p1696 +a(dp1697 +g1664 I280 -sg1645 +sg1665 F0.010999999999999999 sg6 I10 -sg1646 +sg1666 I2 -sg1647 +sg1667 F2.2999999999999998 -saa(lp1678 +saa(lp1698 S'int_hyperdrive_size4_class2' -p1679 -a(dp1680 -g1644 +p1699 +a(dp1700 +g1664 I315 -sg1645 +sg1665 F0.01 sg6 I4 -sg1646 +sg1666 I2 -sg1647 +sg1667 F2.2999999999999998 -saa(lp1681 +saa(lp1701 S'int_hyperdrive_size4_class3' -p1682 -a(dp1683 -g1644 +p1702 +a(dp1703 +g1664 I350 -sg1645 +sg1665 F0.0080000000000000002 sg6 I10 -sg1646 +sg1666 I2 -sg1647 +sg1667 F2.2999999999999998 -saa(lp1684 +saa(lp1704 S'int_hyperdrive_size4_class4' -p1685 -a(dp1686 -g1644 +p1705 +a(dp1706 +g1664 F437.5 -sg1645 +sg1665 F0.01 sg6 I16 -sg1646 +sg1666 F2.5 -sg1647 +sg1667 F2.2999999999999998 -saa(lp1687 +saa(lp1707 S'int_hyperdrive_size4_class5' -p1688 -a(dp1689 -g1644 +p1708 +a(dp1709 +g1664 I525 -sg1645 +sg1665 F0.012 sg6 I10 -sg1646 +sg1666 I3 -sg1647 +sg1667 F2.2999999999999998 -saa(lp1690 +saa(lp1710 S'int_hyperdrive_size5_class1' -p1691 -a(dp1692 -g1644 +p1711 +a(dp1712 +g1664 I560 -sg1645 +sg1665 F0.010999999999999999 sg6 I20 -sg1646 +sg1666 F3.2999999999999998 -sg1647 +sg1667 F2.4500000000000002 -saa(lp1693 +saa(lp1713 S'int_hyperdrive_size5_class2' -p1694 -a(dp1695 -g1644 +p1714 +a(dp1715 +g1664 I630 -sg1645 +sg1665 F0.01 sg6 I8 -sg1646 +sg1666 F3.2999999999999998 -sg1647 +sg1667 F2.4500000000000002 -saa(lp1696 +saa(lp1716 S'int_hyperdrive_size5_class3' -p1697 -a(dp1698 -g1644 +p1717 +a(dp1718 +g1664 I700 -sg1645 +sg1665 F0.0080000000000000002 sg6 I20 -sg1646 +sg1666 F3.2999999999999998 -sg1647 +sg1667 F2.4500000000000002 -saa(lp1699 +saa(lp1719 S'int_hyperdrive_size5_class4' -p1700 -a(dp1701 -g1644 +p1720 +a(dp1721 +g1664 I875 -sg1645 +sg1665 F0.01 sg6 I32 -sg1646 +sg1666 F4.0999999999999996 -sg1647 +sg1667 F2.4500000000000002 -saa(lp1702 +saa(lp1722 S'int_hyperdrive_size5_class5' -p1703 -a(dp1704 -g1644 +p1723 +a(dp1724 +g1664 I1050 -sg1645 +sg1665 F0.012 sg6 I20 -sg1646 +sg1666 I5 -sg1647 +sg1667 F2.4500000000000002 -saa(lp1705 +saa(lp1725 S'int_hyperdrive_size6_class1' -p1706 -a(dp1707 -g1644 +p1726 +a(dp1727 +g1664 I960 -sg1645 +sg1665 F0.010999999999999999 sg6 I40 -sg1646 +sg1666 F5.2999999999999998 -sg1647 +sg1667 F2.6000000000000001 -saa(lp1708 +saa(lp1728 S'int_hyperdrive_size6_class2' -p1709 -a(dp1710 -g1644 +p1729 +a(dp1730 +g1664 I1080 -sg1645 +sg1665 F0.01 sg6 I16 -sg1646 +sg1666 F5.2999999999999998 -sg1647 +sg1667 F2.6000000000000001 -saa(lp1711 +saa(lp1731 S'int_hyperdrive_size6_class3' -p1712 -a(dp1713 -g1644 +p1732 +a(dp1733 +g1664 I1200 -sg1645 +sg1665 F0.0080000000000000002 sg6 I40 -sg1646 +sg1666 F5.2999999999999998 -sg1647 +sg1667 F2.6000000000000001 -saa(lp1714 +saa(lp1734 S'int_hyperdrive_size6_class4' -p1715 -a(dp1716 -g1644 +p1735 +a(dp1736 +g1664 I1500 -sg1645 +sg1665 F0.01 sg6 I64 -sg1646 +sg1666 F6.5999999999999996 -sg1647 +sg1667 F2.6000000000000001 -saa(lp1717 +saa(lp1737 S'int_hyperdrive_size6_class5' -p1718 -a(dp1719 -g1644 +p1738 +a(dp1739 +g1664 I1800 -sg1645 +sg1665 F0.012 sg6 I40 -sg1646 +sg1666 I8 -sg1647 +sg1667 F2.6000000000000001 -saa(lp1720 +saa(lp1740 S'int_hyperdrive_size7_class1' -p1721 -a(dp1722 -g1644 +p1741 +a(dp1742 +g1664 I1440 -sg1645 +sg1665 F0.010999999999999999 sg6 I80 -sg1646 +sg1666 F8.5 -sg1647 +sg1667 F2.75 -saa(lp1723 +saa(lp1743 S'int_hyperdrive_size7_class2' -p1724 -a(dp1725 -g1644 +p1744 +a(dp1745 +g1664 I1620 -sg1645 +sg1665 F0.01 sg6 I32 -sg1646 +sg1666 F8.5 -sg1647 +sg1667 F2.75 -saa(lp1726 +saa(lp1746 S'int_hyperdrive_size7_class3' -p1727 -a(dp1728 -g1644 +p1747 +a(dp1748 +g1664 I1800 -sg1645 +sg1665 F0.0080000000000000002 sg6 I80 -sg1646 +sg1666 F8.5 -sg1647 +sg1667 F2.75 -saa(lp1729 +saa(lp1749 S'int_hyperdrive_size7_class4' -p1730 -a(dp1731 -g1644 +p1750 +a(dp1751 +g1664 I2250 -sg1645 +sg1665 F0.01 sg6 I128 -sg1646 +sg1666 F10.6 -sg1647 +sg1667 F2.75 -saa(lp1732 +saa(lp1752 S'int_hyperdrive_size7_class5' -p1733 -a(dp1734 -g1644 +p1753 +a(dp1754 +g1664 I2700 -sg1645 +sg1665 F0.012 sg6 I80 -sg1646 +sg1666 F12.800000000000001 -sg1647 +sg1667 F2.75 -saa(lp1735 +saa(lp1755 S'int_hyperdrive_size8_class1' -p1736 -a(dp1737 -g1644 +p1756 +a(dp1757 +g1664 I0 -sg1645 +sg1665 F0.010999999999999999 sg6 I160 -sg1646 +sg1666 I0 -sg1647 +sg1667 F2.8999999999999999 -saa(lp1738 +saa(lp1758 S'int_hyperdrive_size8_class2' -p1739 -a(dp1740 -g1644 +p1759 +a(dp1760 +g1664 I0 -sg1645 +sg1665 F0.01 sg6 I64 -sg1646 +sg1666 I0 -sg1647 +sg1667 F2.8999999999999999 -saa(lp1741 +saa(lp1761 S'int_hyperdrive_size8_class3' -p1742 -a(dp1743 -g1644 +p1762 +a(dp1763 +g1664 I0 -sg1645 +sg1665 F0.0080000000000000002 sg6 I160 -sg1646 +sg1666 I0 -sg1647 +sg1667 F2.8999999999999999 -saa(lp1744 +saa(lp1764 S'int_hyperdrive_size8_class4' -p1745 -a(dp1746 -g1644 +p1765 +a(dp1766 +g1664 I0 -sg1645 +sg1665 F0.01 sg6 I256 -sg1646 +sg1666 I0 -sg1647 +sg1667 F2.8999999999999999 -saa(lp1747 +saa(lp1767 S'int_hyperdrive_size8_class5' -p1748 -a(dp1749 -g1644 +p1768 +a(dp1769 +g1664 I0 -sg1645 +sg1665 F0.012 sg6 I160 -sg1646 +sg1666 I0 -sg1647 +sg1667 F2.8999999999999999 -saa(lp1750 +saa(lp1770 S'int_lifesupport_size1_class1' -p1751 -a(dp1752 +p1771 +a(dp1772 g6 F1.3 -saa(lp1753 +saa(lp1773 S'int_lifesupport_size1_class2' -p1754 -a(dp1755 +p1774 +a(dp1775 g6 F0.5 -saa(lp1756 +saa(lp1776 S'int_lifesupport_size1_class3' -p1757 -a(dp1758 +p1777 +a(dp1778 g6 F1.3 -saa(lp1759 +saa(lp1779 S'int_lifesupport_size1_class4' -p1760 -a(dp1761 +p1780 +a(dp1781 g6 I2 -saa(lp1762 +saa(lp1782 S'int_lifesupport_size1_class5' -p1763 -a(dp1764 +p1783 +a(dp1784 g6 F1.3 -saa(lp1765 +saa(lp1785 S'int_lifesupport_size2_class1' -p1766 -a(dp1767 +p1786 +a(dp1787 g6 F2.5 -saa(lp1768 +saa(lp1788 S'int_lifesupport_size2_class2' -p1769 -a(dp1770 +p1789 +a(dp1790 g6 I1 -saa(lp1771 +saa(lp1791 S'int_lifesupport_size2_class3' -p1772 -a(dp1773 +p1792 +a(dp1793 g6 F2.5 -saa(lp1774 +saa(lp1794 S'int_lifesupport_size2_class4' -p1775 -a(dp1776 +p1795 +a(dp1796 g6 I4 -saa(lp1777 +saa(lp1797 S'int_lifesupport_size2_class5' -p1778 -a(dp1779 +p1798 +a(dp1799 g6 F2.5 -saa(lp1780 +saa(lp1800 S'int_lifesupport_size3_class1' -p1781 -a(dp1782 +p1801 +a(dp1802 g6 I5 -saa(lp1783 +saa(lp1803 S'int_lifesupport_size3_class2' -p1784 -a(dp1785 +p1804 +a(dp1805 g6 I2 -saa(lp1786 +saa(lp1806 S'int_lifesupport_size3_class3' -p1787 -a(dp1788 +p1807 +a(dp1808 g6 I5 -saa(lp1789 +saa(lp1809 S'int_lifesupport_size3_class4' -p1790 -a(dp1791 +p1810 +a(dp1811 g6 I8 -saa(lp1792 +saa(lp1812 S'int_lifesupport_size3_class5' -p1793 -a(dp1794 +p1813 +a(dp1814 g6 I5 -saa(lp1795 +saa(lp1815 S'int_lifesupport_size4_class1' -p1796 -a(dp1797 +p1816 +a(dp1817 g6 I10 -saa(lp1798 +saa(lp1818 S'int_lifesupport_size4_class2' -p1799 -a(dp1800 +p1819 +a(dp1820 g6 I4 -saa(lp1801 +saa(lp1821 S'int_lifesupport_size4_class3' -p1802 -a(dp1803 +p1822 +a(dp1823 g6 I10 -saa(lp1804 +saa(lp1824 S'int_lifesupport_size4_class4' -p1805 -a(dp1806 +p1825 +a(dp1826 g6 I16 -saa(lp1807 +saa(lp1827 S'int_lifesupport_size4_class5' -p1808 -a(dp1809 +p1828 +a(dp1829 g6 I10 -saa(lp1810 +saa(lp1830 S'int_lifesupport_size5_class1' -p1811 -a(dp1812 +p1831 +a(dp1832 g6 I20 -saa(lp1813 +saa(lp1833 S'int_lifesupport_size5_class2' -p1814 -a(dp1815 +p1834 +a(dp1835 g6 I8 -saa(lp1816 +saa(lp1836 S'int_lifesupport_size5_class3' -p1817 -a(dp1818 +p1837 +a(dp1838 g6 I20 -saa(lp1819 +saa(lp1839 S'int_lifesupport_size5_class4' -p1820 -a(dp1821 +p1840 +a(dp1841 g6 I32 -saa(lp1822 +saa(lp1842 S'int_lifesupport_size5_class5' -p1823 -a(dp1824 +p1843 +a(dp1844 g6 I20 -saa(lp1825 +saa(lp1845 S'int_lifesupport_size6_class1' -p1826 -a(dp1827 +p1846 +a(dp1847 g6 I40 -saa(lp1828 +saa(lp1848 S'int_lifesupport_size6_class2' -p1829 -a(dp1830 +p1849 +a(dp1850 g6 I16 -saa(lp1831 +saa(lp1851 S'int_lifesupport_size6_class3' -p1832 -a(dp1833 +p1852 +a(dp1853 g6 I40 -saa(lp1834 +saa(lp1854 S'int_lifesupport_size6_class4' -p1835 -a(dp1836 +p1855 +a(dp1856 g6 I64 -saa(lp1837 +saa(lp1857 S'int_lifesupport_size6_class5' -p1838 -a(dp1839 +p1858 +a(dp1859 g6 I40 -saa(lp1840 +saa(lp1860 S'int_lifesupport_size7_class1' -p1841 -a(dp1842 +p1861 +a(dp1862 g6 I80 -saa(lp1843 +saa(lp1863 S'int_lifesupport_size7_class2' -p1844 -a(dp1845 +p1864 +a(dp1865 g6 I32 -saa(lp1846 +saa(lp1866 S'int_lifesupport_size7_class3' -p1847 -a(dp1848 +p1867 +a(dp1868 g6 I80 -saa(lp1849 +saa(lp1869 S'int_lifesupport_size7_class4' -p1850 -a(dp1851 +p1870 +a(dp1871 g6 I128 -saa(lp1852 +saa(lp1872 S'int_lifesupport_size7_class5' -p1853 -a(dp1854 +p1873 +a(dp1874 g6 I80 -saa(lp1855 +saa(lp1875 S'int_lifesupport_size8_class1' -p1856 -a(dp1857 +p1876 +a(dp1877 g6 I160 -saa(lp1858 +saa(lp1878 S'int_lifesupport_size8_class2' -p1859 -a(dp1860 +p1879 +a(dp1880 g6 I64 -saa(lp1861 +saa(lp1881 S'int_lifesupport_size8_class3' -p1862 -a(dp1863 +p1882 +a(dp1883 g6 I160 -saa(lp1864 +saa(lp1884 S'int_lifesupport_size8_class4' -p1865 -a(dp1866 +p1885 +a(dp1886 g6 I256 -saa(lp1867 +saa(lp1887 S'int_lifesupport_size8_class5' -p1868 -a(dp1869 +p1888 +a(dp1889 g6 I160 -saa(lp1870 +saa(lp1890 S'int_metaalloyhullreinforcement_size1_class1' -p1871 -ag1498 -aa(lp1872 -S'int_metaalloyhullreinforcement_size1_class2' -p1873 -ag1501 -aa(lp1874 -S'int_metaalloyhullreinforcement_size2_class1' -p1875 -ag1504 -aa(lp1876 -S'int_metaalloyhullreinforcement_size2_class2' -p1877 -ag1507 -aa(lp1878 -S'int_metaalloyhullreinforcement_size3_class1' -p1879 -ag1510 -aa(lp1880 -S'int_metaalloyhullreinforcement_size3_class2' -p1881 -ag1513 -aa(lp1882 -S'int_metaalloyhullreinforcement_size4_class1' -p1883 -ag1516 -aa(lp1884 -S'int_metaalloyhullreinforcement_size4_class2' -p1885 -ag1519 -aa(lp1886 -S'int_metaalloyhullreinforcement_size5_class1' -p1887 -ag1522 -aa(lp1888 -S'int_metaalloyhullreinforcement_size5_class2' -p1889 -ag1525 -aa(lp1890 -S'int_modulereinforcement_size1_class1' p1891 a(dp1892 g6 I2 saa(lp1893 -S'int_modulereinforcement_size1_class2' +S'int_metaalloyhullreinforcement_size1_class2' p1894 a(dp1895 g6 -I1 +I2 saa(lp1896 -S'int_modulereinforcement_size2_class1' +S'int_metaalloyhullreinforcement_size2_class1' p1897 a(dp1898 g6 I4 saa(lp1899 -S'int_modulereinforcement_size2_class2' +S'int_metaalloyhullreinforcement_size2_class2' p1900 a(dp1901 g6 I2 saa(lp1902 -S'int_modulereinforcement_size3_class1' +S'int_metaalloyhullreinforcement_size3_class1' p1903 a(dp1904 g6 I8 saa(lp1905 -S'int_modulereinforcement_size3_class2' +S'int_metaalloyhullreinforcement_size3_class2' p1906 a(dp1907 g6 I4 saa(lp1908 -S'int_modulereinforcement_size4_class1' +S'int_metaalloyhullreinforcement_size4_class1' p1909 a(dp1910 g6 I16 saa(lp1911 -S'int_modulereinforcement_size4_class2' +S'int_metaalloyhullreinforcement_size4_class2' p1912 a(dp1913 g6 I8 saa(lp1914 -S'int_modulereinforcement_size5_class1' +S'int_metaalloyhullreinforcement_size5_class1' p1915 a(dp1916 g6 I32 saa(lp1917 -S'int_modulereinforcement_size5_class2' +S'int_metaalloyhullreinforcement_size5_class2' p1918 a(dp1919 g6 I16 saa(lp1920 -S'int_passengercabin_size2_class1' +S'int_modulereinforcement_size1_class1' p1921 a(dp1922 g6 -F2.5 +I2 saa(lp1923 -S'int_passengercabin_size3_class1' +S'int_modulereinforcement_size1_class2' p1924 a(dp1925 g6 -I5 +I1 saa(lp1926 -S'int_passengercabin_size3_class2' +S'int_modulereinforcement_size2_class1' p1927 a(dp1928 g6 -I5 +I4 saa(lp1929 -S'int_passengercabin_size4_class1' +S'int_modulereinforcement_size2_class2' p1930 a(dp1931 g6 -I10 +I2 saa(lp1932 -S'int_passengercabin_size4_class2' +S'int_modulereinforcement_size3_class1' p1933 a(dp1934 g6 -I10 +I8 saa(lp1935 -S'int_passengercabin_size4_class3' +S'int_modulereinforcement_size3_class2' p1936 a(dp1937 g6 -I10 +I4 saa(lp1938 -S'int_passengercabin_size5_class1' +S'int_modulereinforcement_size4_class1' p1939 a(dp1940 g6 -I20 +I16 saa(lp1941 -S'int_passengercabin_size5_class2' +S'int_modulereinforcement_size4_class2' p1942 a(dp1943 g6 -I20 +I8 saa(lp1944 -S'int_passengercabin_size5_class3' +S'int_modulereinforcement_size5_class1' p1945 a(dp1946 g6 -I20 +I32 saa(lp1947 -S'int_passengercabin_size5_class4' +S'int_modulereinforcement_size5_class2' p1948 a(dp1949 g6 -I20 +I16 saa(lp1950 -S'int_passengercabin_size6_class1' +S'int_passengercabin_size2_class1' p1951 a(dp1952 g6 -I40 +F2.5 saa(lp1953 -S'int_passengercabin_size6_class2' +S'int_passengercabin_size3_class1' p1954 a(dp1955 g6 -I40 +I5 saa(lp1956 -S'int_passengercabin_size6_class3' +S'int_passengercabin_size3_class2' p1957 a(dp1958 g6 -I40 +I5 saa(lp1959 -S'int_passengercabin_size6_class4' +S'int_passengercabin_size4_class1' p1960 a(dp1961 g6 -I40 +I10 saa(lp1962 -S'int_planetapproachsuite' +S'int_passengercabin_size4_class2' p1963 a(dp1964 g6 -I0 +I10 saa(lp1965 -S'int_powerdistributor_size1_class1' +S'int_passengercabin_size4_class3' p1966 a(dp1967 g6 -F1.3 +I10 saa(lp1968 -S'int_powerdistributor_size1_class2' +S'int_passengercabin_size5_class1' p1969 a(dp1970 g6 -F0.5 +I20 saa(lp1971 -S'int_powerdistributor_size1_class3' +S'int_passengercabin_size5_class2' p1972 a(dp1973 g6 -F1.3 +I20 saa(lp1974 -S'int_powerdistributor_size1_class4' +S'int_passengercabin_size5_class3' p1975 a(dp1976 g6 -I2 +I20 saa(lp1977 -S'int_powerdistributor_size1_class5' +S'int_passengercabin_size5_class4' p1978 a(dp1979 g6 -F1.3 +I20 saa(lp1980 -S'int_powerdistributor_size2_class1' +S'int_passengercabin_size6_class1' p1981 a(dp1982 g6 -F2.5 +I40 saa(lp1983 -S'int_powerdistributor_size2_class2' +S'int_passengercabin_size6_class2' p1984 a(dp1985 g6 -I1 +I40 saa(lp1986 -S'int_powerdistributor_size2_class3' +S'int_passengercabin_size6_class3' p1987 a(dp1988 g6 -F2.5 +I40 saa(lp1989 -S'int_powerdistributor_size2_class4' +S'int_passengercabin_size6_class4' p1990 a(dp1991 g6 -I4 +I40 saa(lp1992 -S'int_powerdistributor_size2_class5' +S'int_planetapproachsuite' p1993 a(dp1994 g6 -F2.5 +I0 saa(lp1995 -S'int_powerdistributor_size3_class1' +S'int_powerdistributor_size1_class1' p1996 a(dp1997 g6 -I5 +F1.3 saa(lp1998 -S'int_powerdistributor_size3_class2' +S'int_powerdistributor_size1_class2' p1999 a(dp2000 g6 -I2 +F0.5 saa(lp2001 -S'int_powerdistributor_size3_class3' +S'int_powerdistributor_size1_class3' p2002 a(dp2003 g6 -I5 +F1.3 saa(lp2004 -S'int_powerdistributor_size3_class4' +S'int_powerdistributor_size1_class4' p2005 a(dp2006 g6 -I8 +I2 saa(lp2007 -S'int_powerdistributor_size3_class5' +S'int_powerdistributor_size1_class5' p2008 a(dp2009 g6 -I5 +F1.3 saa(lp2010 -S'int_powerdistributor_size4_class1' +S'int_powerdistributor_size2_class1' p2011 a(dp2012 g6 -I10 +F2.5 saa(lp2013 -S'int_powerdistributor_size4_class2' +S'int_powerdistributor_size2_class2' p2014 a(dp2015 g6 -I4 +I1 saa(lp2016 -S'int_powerdistributor_size4_class3' +S'int_powerdistributor_size2_class3' p2017 a(dp2018 g6 -I10 +F2.5 saa(lp2019 -S'int_powerdistributor_size4_class4' +S'int_powerdistributor_size2_class4' p2020 a(dp2021 g6 -I16 +I4 saa(lp2022 -S'int_powerdistributor_size4_class5' +S'int_powerdistributor_size2_class5' p2023 a(dp2024 g6 -I10 +F2.5 saa(lp2025 -S'int_powerdistributor_size5_class1' +S'int_powerdistributor_size3_class1' p2026 a(dp2027 g6 -I20 +I5 saa(lp2028 -S'int_powerdistributor_size5_class2' +S'int_powerdistributor_size3_class2' p2029 a(dp2030 g6 -I8 +I2 saa(lp2031 -S'int_powerdistributor_size5_class3' +S'int_powerdistributor_size3_class3' p2032 a(dp2033 g6 -I20 +I5 saa(lp2034 -S'int_powerdistributor_size5_class4' +S'int_powerdistributor_size3_class4' p2035 a(dp2036 g6 -I32 +I8 saa(lp2037 -S'int_powerdistributor_size5_class5' +S'int_powerdistributor_size3_class5' p2038 a(dp2039 g6 -I20 +I5 saa(lp2040 -S'int_powerdistributor_size6_class1' +S'int_powerdistributor_size4_class1' p2041 a(dp2042 g6 -I40 +I10 saa(lp2043 -S'int_powerdistributor_size6_class2' +S'int_powerdistributor_size4_class2' p2044 a(dp2045 g6 -I16 +I4 saa(lp2046 -S'int_powerdistributor_size6_class3' +S'int_powerdistributor_size4_class3' p2047 a(dp2048 g6 -I40 +I10 saa(lp2049 -S'int_powerdistributor_size6_class4' +S'int_powerdistributor_size4_class4' p2050 a(dp2051 g6 -I64 +I16 saa(lp2052 -S'int_powerdistributor_size6_class5' +S'int_powerdistributor_size4_class5' p2053 a(dp2054 g6 -I40 +I10 saa(lp2055 -S'int_powerdistributor_size7_class1' +S'int_powerdistributor_size5_class1' p2056 a(dp2057 g6 -I80 +I20 saa(lp2058 -S'int_powerdistributor_size7_class2' +S'int_powerdistributor_size5_class2' p2059 a(dp2060 g6 -I32 +I8 saa(lp2061 -S'int_powerdistributor_size7_class3' +S'int_powerdistributor_size5_class3' p2062 a(dp2063 g6 -I80 +I20 saa(lp2064 -S'int_powerdistributor_size7_class4' +S'int_powerdistributor_size5_class4' p2065 a(dp2066 g6 -I128 +I32 saa(lp2067 -S'int_powerdistributor_size7_class5' +S'int_powerdistributor_size5_class5' p2068 a(dp2069 g6 -I80 +I20 saa(lp2070 -S'int_powerdistributor_size8_class1' +S'int_powerdistributor_size6_class1' p2071 a(dp2072 g6 -I160 +I40 saa(lp2073 -S'int_powerdistributor_size8_class2' +S'int_powerdistributor_size6_class2' p2074 a(dp2075 g6 -I64 +I16 saa(lp2076 -S'int_powerdistributor_size8_class3' +S'int_powerdistributor_size6_class3' p2077 a(dp2078 g6 -I160 +I40 saa(lp2079 -S'int_powerdistributor_size8_class4' +S'int_powerdistributor_size6_class4' p2080 a(dp2081 g6 -I256 +I64 saa(lp2082 -S'int_powerdistributor_size8_class5' +S'int_powerdistributor_size6_class5' p2083 a(dp2084 g6 -I160 +I40 saa(lp2085 -S'int_powerplant_size2_class1' +S'int_powerdistributor_size7_class1' p2086 a(dp2087 g6 -F2.5 +I80 saa(lp2088 -S'int_powerplant_size2_class2' +S'int_powerdistributor_size7_class2' p2089 a(dp2090 g6 -I1 +I32 saa(lp2091 -S'int_powerplant_size2_class3' +S'int_powerdistributor_size7_class3' p2092 a(dp2093 g6 -F1.3 +I80 saa(lp2094 -S'int_powerplant_size2_class4' +S'int_powerdistributor_size7_class4' p2095 a(dp2096 g6 -I2 +I128 saa(lp2097 -S'int_powerplant_size2_class5' +S'int_powerdistributor_size7_class5' p2098 a(dp2099 g6 -F1.3 +I80 saa(lp2100 -S'int_powerplant_size3_class1' +S'int_powerdistributor_size8_class1' p2101 a(dp2102 g6 -I5 +I160 saa(lp2103 -S'int_powerplant_size3_class2' +S'int_powerdistributor_size8_class2' p2104 a(dp2105 g6 -I2 +I64 saa(lp2106 -S'int_powerplant_size3_class3' +S'int_powerdistributor_size8_class3' p2107 a(dp2108 g6 -F2.5 +I160 saa(lp2109 -S'int_powerplant_size3_class4' +S'int_powerdistributor_size8_class4' p2110 a(dp2111 g6 -I4 +I256 saa(lp2112 -S'int_powerplant_size3_class5' +S'int_powerdistributor_size8_class5' p2113 a(dp2114 g6 -F2.5 +I160 saa(lp2115 -S'int_powerplant_size4_class1' +S'int_powerplant_size2_class1' p2116 a(dp2117 g6 -I10 +F2.5 saa(lp2118 -S'int_powerplant_size4_class2' +S'int_powerplant_size2_class2' p2119 a(dp2120 g6 -I4 +I1 saa(lp2121 -S'int_powerplant_size4_class3' +S'int_powerplant_size2_class3' p2122 a(dp2123 g6 -I5 +F1.3 saa(lp2124 -S'int_powerplant_size4_class4' +S'int_powerplant_size2_class4' p2125 a(dp2126 g6 -I8 +I2 saa(lp2127 -S'int_powerplant_size4_class5' +S'int_powerplant_size2_class5' p2128 a(dp2129 g6 -I5 +F1.3 saa(lp2130 -S'int_powerplant_size5_class1' +S'int_powerplant_size3_class1' p2131 a(dp2132 g6 -I20 +I5 saa(lp2133 -S'int_powerplant_size5_class2' +S'int_powerplant_size3_class2' p2134 a(dp2135 g6 -I8 +I2 saa(lp2136 -S'int_powerplant_size5_class3' +S'int_powerplant_size3_class3' p2137 a(dp2138 g6 -I10 +F2.5 saa(lp2139 -S'int_powerplant_size5_class4' +S'int_powerplant_size3_class4' p2140 a(dp2141 g6 -I16 +I4 saa(lp2142 -S'int_powerplant_size5_class5' +S'int_powerplant_size3_class5' p2143 a(dp2144 g6 -I10 +F2.5 saa(lp2145 -S'int_powerplant_size6_class1' +S'int_powerplant_size4_class1' p2146 a(dp2147 g6 -I40 +I10 saa(lp2148 -S'int_powerplant_size6_class2' +S'int_powerplant_size4_class2' p2149 a(dp2150 g6 -I16 +I4 saa(lp2151 -S'int_powerplant_size6_class3' +S'int_powerplant_size4_class3' p2152 a(dp2153 g6 -I20 +I5 saa(lp2154 -S'int_powerplant_size6_class4' +S'int_powerplant_size4_class4' p2155 a(dp2156 g6 -I32 +I8 saa(lp2157 -S'int_powerplant_size6_class5' +S'int_powerplant_size4_class5' p2158 a(dp2159 g6 -I20 +I5 saa(lp2160 -S'int_powerplant_size7_class1' +S'int_powerplant_size5_class1' p2161 a(dp2162 g6 -I80 +I20 saa(lp2163 -S'int_powerplant_size7_class2' +S'int_powerplant_size5_class2' p2164 a(dp2165 g6 -I32 +I8 saa(lp2166 -S'int_powerplant_size7_class3' +S'int_powerplant_size5_class3' p2167 a(dp2168 g6 -I40 +I10 saa(lp2169 -S'int_powerplant_size7_class4' +S'int_powerplant_size5_class4' p2170 a(dp2171 g6 -I64 +I16 saa(lp2172 -S'int_powerplant_size7_class5' +S'int_powerplant_size5_class5' p2173 a(dp2174 g6 -I40 +I10 saa(lp2175 -S'int_powerplant_size8_class1' +S'int_powerplant_size6_class1' p2176 a(dp2177 g6 -I160 +I40 saa(lp2178 -S'int_powerplant_size8_class2' +S'int_powerplant_size6_class2' p2179 a(dp2180 g6 -I64 +I16 saa(lp2181 -S'int_powerplant_size8_class3' +S'int_powerplant_size6_class3' p2182 a(dp2183 g6 -I80 +I20 saa(lp2184 -S'int_powerplant_size8_class4' +S'int_powerplant_size6_class4' p2185 a(dp2186 g6 -I128 +I32 saa(lp2187 -S'int_powerplant_size8_class5' +S'int_powerplant_size6_class5' p2188 a(dp2189 g6 -I80 +I20 saa(lp2190 -S'int_refinery_size1_class1' +S'int_powerplant_size7_class1' p2191 a(dp2192 g6 -I0 +I80 saa(lp2193 -S'int_refinery_size1_class2' +S'int_powerplant_size7_class2' p2194 a(dp2195 g6 -I0 +I32 saa(lp2196 -S'int_refinery_size1_class3' +S'int_powerplant_size7_class3' p2197 a(dp2198 g6 -I0 +I40 saa(lp2199 -S'int_refinery_size1_class4' +S'int_powerplant_size7_class4' p2200 a(dp2201 g6 -I0 +I64 saa(lp2202 -S'int_refinery_size1_class5' +S'int_powerplant_size7_class5' p2203 a(dp2204 g6 -I0 +I40 saa(lp2205 -S'int_refinery_size2_class1' +S'int_powerplant_size8_class1' p2206 a(dp2207 g6 -I0 +I160 saa(lp2208 -S'int_refinery_size2_class2' +S'int_powerplant_size8_class2' p2209 a(dp2210 g6 -I0 +I64 saa(lp2211 -S'int_refinery_size2_class3' +S'int_powerplant_size8_class3' p2212 a(dp2213 g6 -I0 +I80 saa(lp2214 -S'int_refinery_size2_class4' +S'int_powerplant_size8_class4' p2215 a(dp2216 g6 -I0 +I128 saa(lp2217 -S'int_refinery_size2_class5' +S'int_powerplant_size8_class5' p2218 a(dp2219 g6 -I0 +I80 saa(lp2220 -S'int_refinery_size3_class1' +S'int_refinery_size1_class1' p2221 a(dp2222 g6 I0 saa(lp2223 -S'int_refinery_size3_class2' +S'int_refinery_size1_class2' p2224 a(dp2225 g6 I0 saa(lp2226 -S'int_refinery_size3_class3' +S'int_refinery_size1_class3' p2227 a(dp2228 g6 I0 saa(lp2229 -S'int_refinery_size3_class4' +S'int_refinery_size1_class4' p2230 a(dp2231 g6 I0 saa(lp2232 -S'int_refinery_size3_class5' +S'int_refinery_size1_class5' p2233 a(dp2234 g6 I0 saa(lp2235 -S'int_refinery_size4_class1' +S'int_refinery_size2_class1' p2236 a(dp2237 g6 I0 saa(lp2238 -S'int_refinery_size4_class2' +S'int_refinery_size2_class2' p2239 a(dp2240 g6 I0 saa(lp2241 -S'int_refinery_size4_class3' +S'int_refinery_size2_class3' p2242 a(dp2243 g6 I0 saa(lp2244 -S'int_refinery_size4_class4' +S'int_refinery_size2_class4' p2245 a(dp2246 g6 I0 saa(lp2247 -S'int_refinery_size4_class5' +S'int_refinery_size2_class5' p2248 a(dp2249 g6 I0 saa(lp2250 -S'int_repairer_size1_class1' +S'int_refinery_size3_class1' p2251 a(dp2252 g6 I0 saa(lp2253 -S'int_repairer_size1_class2' +S'int_refinery_size3_class2' p2254 a(dp2255 g6 I0 saa(lp2256 -S'int_repairer_size1_class3' +S'int_refinery_size3_class3' p2257 a(dp2258 g6 I0 saa(lp2259 -S'int_repairer_size1_class4' +S'int_refinery_size3_class4' p2260 a(dp2261 g6 I0 saa(lp2262 -S'int_repairer_size1_class5' +S'int_refinery_size3_class5' p2263 a(dp2264 g6 I0 saa(lp2265 -S'int_repairer_size2_class1' +S'int_refinery_size4_class1' p2266 a(dp2267 g6 I0 saa(lp2268 -S'int_repairer_size2_class2' +S'int_refinery_size4_class2' p2269 a(dp2270 g6 I0 saa(lp2271 -S'int_repairer_size2_class3' +S'int_refinery_size4_class3' p2272 a(dp2273 g6 I0 saa(lp2274 -S'int_repairer_size2_class4' +S'int_refinery_size4_class4' p2275 a(dp2276 g6 I0 saa(lp2277 -S'int_repairer_size2_class5' +S'int_refinery_size4_class5' p2278 a(dp2279 g6 I0 saa(lp2280 -S'int_repairer_size3_class1' +S'int_repairer_size1_class1' p2281 a(dp2282 g6 I0 saa(lp2283 -S'int_repairer_size3_class2' +S'int_repairer_size1_class2' p2284 a(dp2285 g6 I0 saa(lp2286 -S'int_repairer_size3_class3' +S'int_repairer_size1_class3' p2287 a(dp2288 g6 I0 saa(lp2289 -S'int_repairer_size3_class4' +S'int_repairer_size1_class4' p2290 a(dp2291 g6 I0 saa(lp2292 -S'int_repairer_size3_class5' +S'int_repairer_size1_class5' p2293 a(dp2294 g6 I0 saa(lp2295 -S'int_repairer_size4_class1' +S'int_repairer_size2_class1' p2296 a(dp2297 g6 I0 saa(lp2298 -S'int_repairer_size4_class2' +S'int_repairer_size2_class2' p2299 a(dp2300 g6 I0 saa(lp2301 -S'int_repairer_size4_class3' +S'int_repairer_size2_class3' p2302 a(dp2303 g6 I0 saa(lp2304 -S'int_repairer_size4_class4' +S'int_repairer_size2_class4' p2305 a(dp2306 g6 I0 saa(lp2307 -S'int_repairer_size4_class5' +S'int_repairer_size2_class5' p2308 a(dp2309 g6 I0 saa(lp2310 -S'int_repairer_size5_class1' +S'int_repairer_size3_class1' p2311 a(dp2312 g6 I0 saa(lp2313 -S'int_repairer_size5_class2' +S'int_repairer_size3_class2' p2314 a(dp2315 g6 I0 saa(lp2316 -S'int_repairer_size5_class3' +S'int_repairer_size3_class3' p2317 a(dp2318 g6 I0 saa(lp2319 -S'int_repairer_size5_class4' +S'int_repairer_size3_class4' p2320 a(dp2321 g6 I0 saa(lp2322 -S'int_repairer_size5_class5' +S'int_repairer_size3_class5' p2323 a(dp2324 g6 I0 saa(lp2325 -S'int_repairer_size6_class1' +S'int_repairer_size4_class1' p2326 a(dp2327 g6 I0 saa(lp2328 -S'int_repairer_size6_class2' +S'int_repairer_size4_class2' p2329 a(dp2330 g6 I0 saa(lp2331 -S'int_repairer_size6_class3' +S'int_repairer_size4_class3' p2332 a(dp2333 g6 I0 saa(lp2334 -S'int_repairer_size6_class4' +S'int_repairer_size4_class4' p2335 a(dp2336 g6 I0 saa(lp2337 -S'int_repairer_size6_class5' +S'int_repairer_size4_class5' p2338 a(dp2339 g6 I0 saa(lp2340 -S'int_repairer_size7_class1' +S'int_repairer_size5_class1' p2341 a(dp2342 g6 I0 saa(lp2343 -S'int_repairer_size7_class2' +S'int_repairer_size5_class2' p2344 a(dp2345 g6 I0 saa(lp2346 -S'int_repairer_size7_class3' +S'int_repairer_size5_class3' p2347 a(dp2348 g6 I0 saa(lp2349 -S'int_repairer_size7_class4' +S'int_repairer_size5_class4' p2350 a(dp2351 g6 I0 saa(lp2352 -S'int_repairer_size7_class5' +S'int_repairer_size5_class5' p2353 a(dp2354 g6 I0 saa(lp2355 -S'int_repairer_size8_class1' +S'int_repairer_size6_class1' p2356 a(dp2357 g6 I0 saa(lp2358 -S'int_repairer_size8_class2' +S'int_repairer_size6_class2' p2359 a(dp2360 g6 I0 saa(lp2361 -S'int_repairer_size8_class3' +S'int_repairer_size6_class3' p2362 a(dp2363 g6 I0 saa(lp2364 -S'int_repairer_size8_class4' +S'int_repairer_size6_class4' p2365 a(dp2366 g6 I0 saa(lp2367 -S'int_repairer_size8_class5' +S'int_repairer_size6_class5' p2368 a(dp2369 g6 I0 saa(lp2370 -S'int_sensors_size1_class1' +S'int_repairer_size7_class1' p2371 a(dp2372 g6 -F1.3 +I0 saa(lp2373 -S'int_sensors_size1_class2' +S'int_repairer_size7_class2' p2374 a(dp2375 g6 -F0.5 +I0 saa(lp2376 -S'int_sensors_size1_class3' +S'int_repairer_size7_class3' p2377 a(dp2378 g6 -F1.3 +I0 saa(lp2379 -S'int_sensors_size1_class4' +S'int_repairer_size7_class4' p2380 a(dp2381 g6 -I2 +I0 saa(lp2382 -S'int_sensors_size1_class5' +S'int_repairer_size7_class5' p2383 a(dp2384 g6 -F1.3 +I0 saa(lp2385 -S'int_sensors_size2_class1' +S'int_repairer_size8_class1' p2386 a(dp2387 g6 -F2.5 +I0 saa(lp2388 -S'int_sensors_size2_class2' +S'int_repairer_size8_class2' p2389 a(dp2390 g6 -I1 +I0 saa(lp2391 -S'int_sensors_size2_class3' +S'int_repairer_size8_class3' p2392 a(dp2393 g6 -F2.5 +I0 saa(lp2394 -S'int_sensors_size2_class4' +S'int_repairer_size8_class4' p2395 a(dp2396 g6 -I4 +I0 saa(lp2397 -S'int_sensors_size2_class5' +S'int_repairer_size8_class5' p2398 a(dp2399 g6 -F2.5 +I0 saa(lp2400 -S'int_sensors_size3_class1' +S'int_sensors_size1_class1' p2401 a(dp2402 g6 -I5 +F1.3 saa(lp2403 -S'int_sensors_size3_class2' +S'int_sensors_size1_class2' p2404 a(dp2405 g6 -I2 +F0.5 saa(lp2406 -S'int_sensors_size3_class3' +S'int_sensors_size1_class3' p2407 a(dp2408 g6 -I5 +F1.3 saa(lp2409 -S'int_sensors_size3_class4' +S'int_sensors_size1_class4' p2410 a(dp2411 g6 -I8 +I2 saa(lp2412 -S'int_sensors_size3_class5' +S'int_sensors_size1_class5' p2413 a(dp2414 g6 -I5 +F1.3 saa(lp2415 -S'int_sensors_size4_class1' +S'int_sensors_size2_class1' p2416 a(dp2417 g6 -I10 +F2.5 saa(lp2418 -S'int_sensors_size4_class2' +S'int_sensors_size2_class2' p2419 a(dp2420 g6 -I4 +I1 saa(lp2421 -S'int_sensors_size4_class3' +S'int_sensors_size2_class3' p2422 a(dp2423 g6 -I10 +F2.5 saa(lp2424 -S'int_sensors_size4_class4' +S'int_sensors_size2_class4' p2425 a(dp2426 g6 -I16 +I4 saa(lp2427 -S'int_sensors_size4_class5' +S'int_sensors_size2_class5' p2428 a(dp2429 g6 -I10 +F2.5 saa(lp2430 -S'int_sensors_size5_class1' +S'int_sensors_size3_class1' p2431 a(dp2432 g6 -I20 +I5 saa(lp2433 -S'int_sensors_size5_class2' +S'int_sensors_size3_class2' p2434 a(dp2435 g6 -I8 +I2 saa(lp2436 -S'int_sensors_size5_class3' +S'int_sensors_size3_class3' p2437 a(dp2438 g6 -I20 +I5 saa(lp2439 -S'int_sensors_size5_class4' +S'int_sensors_size3_class4' p2440 a(dp2441 g6 -I32 +I8 saa(lp2442 -S'int_sensors_size5_class5' +S'int_sensors_size3_class5' p2443 a(dp2444 g6 -I20 +I5 saa(lp2445 -S'int_sensors_size6_class1' +S'int_sensors_size4_class1' p2446 a(dp2447 g6 -I40 +I10 saa(lp2448 -S'int_sensors_size6_class2' +S'int_sensors_size4_class2' p2449 a(dp2450 g6 -I16 +I4 saa(lp2451 -S'int_sensors_size6_class3' +S'int_sensors_size4_class3' p2452 a(dp2453 g6 -I40 +I10 saa(lp2454 -S'int_sensors_size6_class4' +S'int_sensors_size4_class4' p2455 a(dp2456 g6 -I64 +I16 saa(lp2457 -S'int_sensors_size6_class5' +S'int_sensors_size4_class5' p2458 a(dp2459 g6 -I40 +I10 saa(lp2460 -S'int_sensors_size7_class1' +S'int_sensors_size5_class1' p2461 a(dp2462 g6 -I80 +I20 saa(lp2463 -S'int_sensors_size7_class2' +S'int_sensors_size5_class2' p2464 a(dp2465 g6 -I32 +I8 saa(lp2466 -S'int_sensors_size7_class3' +S'int_sensors_size5_class3' p2467 a(dp2468 g6 -I80 +I20 saa(lp2469 -S'int_sensors_size7_class4' +S'int_sensors_size5_class4' p2470 a(dp2471 g6 -I128 +I32 saa(lp2472 -S'int_sensors_size7_class5' +S'int_sensors_size5_class5' p2473 a(dp2474 g6 -I80 +I20 saa(lp2475 -S'int_sensors_size8_class1' +S'int_sensors_size6_class1' p2476 a(dp2477 g6 -I160 +I40 saa(lp2478 -S'int_sensors_size8_class2' +S'int_sensors_size6_class2' p2479 a(dp2480 g6 -I64 +I16 saa(lp2481 -S'int_sensors_size8_class3' +S'int_sensors_size6_class3' p2482 a(dp2483 g6 -I160 +I40 saa(lp2484 -S'int_sensors_size8_class4' +S'int_sensors_size6_class4' p2485 a(dp2486 g6 -I256 +I64 saa(lp2487 -S'int_sensors_size8_class5' +S'int_sensors_size6_class5' p2488 a(dp2489 g6 -I160 +I40 saa(lp2490 -S'int_shieldcellbank_size1_class1' +S'int_sensors_size7_class1' p2491 a(dp2492 g6 -F1.3 +I80 saa(lp2493 -S'int_shieldcellbank_size1_class2' +S'int_sensors_size7_class2' p2494 a(dp2495 g6 -F0.5 +I32 saa(lp2496 -S'int_shieldcellbank_size1_class3' +S'int_sensors_size7_class3' p2497 a(dp2498 g6 -F1.3 +I80 saa(lp2499 -S'int_shieldcellbank_size1_class4' +S'int_sensors_size7_class4' p2500 a(dp2501 g6 -I2 +I128 saa(lp2502 -S'int_shieldcellbank_size1_class5' +S'int_sensors_size7_class5' p2503 a(dp2504 g6 -F1.3 +I80 saa(lp2505 -S'int_shieldcellbank_size2_class1' +S'int_sensors_size8_class1' p2506 a(dp2507 g6 -F2.5 +I160 saa(lp2508 -S'int_shieldcellbank_size2_class2' +S'int_sensors_size8_class2' p2509 a(dp2510 g6 -I1 +I64 saa(lp2511 -S'int_shieldcellbank_size2_class3' +S'int_sensors_size8_class3' p2512 a(dp2513 g6 -F2.5 +I160 saa(lp2514 -S'int_shieldcellbank_size2_class4' +S'int_sensors_size8_class4' p2515 a(dp2516 g6 -I4 +I256 saa(lp2517 -S'int_shieldcellbank_size2_class5' +S'int_sensors_size8_class5' p2518 a(dp2519 g6 -F2.5 +I160 saa(lp2520 -S'int_shieldcellbank_size3_class1' +S'int_shieldcellbank_size1_class1' p2521 a(dp2522 g6 -I5 +F1.3 saa(lp2523 -S'int_shieldcellbank_size3_class2' +S'int_shieldcellbank_size1_class2' p2524 a(dp2525 g6 -I2 +F0.5 saa(lp2526 -S'int_shieldcellbank_size3_class3' +S'int_shieldcellbank_size1_class3' p2527 a(dp2528 g6 -I5 +F1.3 saa(lp2529 -S'int_shieldcellbank_size3_class4' +S'int_shieldcellbank_size1_class4' p2530 a(dp2531 g6 -I8 +I2 saa(lp2532 -S'int_shieldcellbank_size3_class5' +S'int_shieldcellbank_size1_class5' p2533 a(dp2534 g6 -I5 +F1.3 saa(lp2535 -S'int_shieldcellbank_size4_class1' +S'int_shieldcellbank_size2_class1' p2536 a(dp2537 g6 -I10 +F2.5 saa(lp2538 -S'int_shieldcellbank_size4_class2' +S'int_shieldcellbank_size2_class2' p2539 a(dp2540 g6 -I4 +I1 saa(lp2541 -S'int_shieldcellbank_size4_class3' +S'int_shieldcellbank_size2_class3' p2542 a(dp2543 g6 -I10 +F2.5 saa(lp2544 -S'int_shieldcellbank_size4_class4' +S'int_shieldcellbank_size2_class4' p2545 a(dp2546 g6 -I16 +I4 saa(lp2547 -S'int_shieldcellbank_size4_class5' +S'int_shieldcellbank_size2_class5' p2548 a(dp2549 g6 -I10 +F2.5 saa(lp2550 -S'int_shieldcellbank_size5_class1' +S'int_shieldcellbank_size3_class1' p2551 a(dp2552 g6 -I20 +I5 saa(lp2553 -S'int_shieldcellbank_size5_class2' +S'int_shieldcellbank_size3_class2' p2554 a(dp2555 g6 -I8 +I2 saa(lp2556 -S'int_shieldcellbank_size5_class3' +S'int_shieldcellbank_size3_class3' p2557 a(dp2558 g6 -I20 +I5 saa(lp2559 -S'int_shieldcellbank_size5_class4' +S'int_shieldcellbank_size3_class4' p2560 a(dp2561 g6 -I32 +I8 saa(lp2562 -S'int_shieldcellbank_size5_class5' +S'int_shieldcellbank_size3_class5' p2563 a(dp2564 g6 -I20 +I5 saa(lp2565 -S'int_shieldcellbank_size6_class1' +S'int_shieldcellbank_size4_class1' p2566 a(dp2567 g6 -I40 +I10 saa(lp2568 -S'int_shieldcellbank_size6_class2' +S'int_shieldcellbank_size4_class2' p2569 a(dp2570 g6 -I16 +I4 saa(lp2571 -S'int_shieldcellbank_size6_class3' +S'int_shieldcellbank_size4_class3' p2572 a(dp2573 g6 -I40 +I10 saa(lp2574 -S'int_shieldcellbank_size6_class4' +S'int_shieldcellbank_size4_class4' p2575 a(dp2576 g6 -I64 +I16 saa(lp2577 -S'int_shieldcellbank_size6_class5' +S'int_shieldcellbank_size4_class5' p2578 a(dp2579 g6 -I40 +I10 saa(lp2580 -S'int_shieldcellbank_size7_class1' +S'int_shieldcellbank_size5_class1' p2581 a(dp2582 g6 -I80 +I20 saa(lp2583 -S'int_shieldcellbank_size7_class2' +S'int_shieldcellbank_size5_class2' p2584 a(dp2585 g6 -I32 +I8 saa(lp2586 -S'int_shieldcellbank_size7_class3' +S'int_shieldcellbank_size5_class3' p2587 a(dp2588 g6 -I80 +I20 saa(lp2589 -S'int_shieldcellbank_size7_class4' +S'int_shieldcellbank_size5_class4' p2590 a(dp2591 g6 -I128 +I32 saa(lp2592 -S'int_shieldcellbank_size7_class5' +S'int_shieldcellbank_size5_class5' p2593 a(dp2594 g6 -I80 +I20 saa(lp2595 -S'int_shieldcellbank_size8_class1' +S'int_shieldcellbank_size6_class1' p2596 a(dp2597 g6 -I160 +I40 saa(lp2598 -S'int_shieldcellbank_size8_class2' +S'int_shieldcellbank_size6_class2' p2599 a(dp2600 g6 -I64 +I16 saa(lp2601 -S'int_shieldcellbank_size8_class3' +S'int_shieldcellbank_size6_class3' p2602 a(dp2603 g6 -I160 +I40 saa(lp2604 -S'int_shieldcellbank_size8_class4' +S'int_shieldcellbank_size6_class4' p2605 a(dp2606 g6 -I256 +I64 saa(lp2607 -S'int_shieldcellbank_size8_class5' +S'int_shieldcellbank_size6_class5' p2608 a(dp2609 g6 -I160 +I40 saa(lp2610 -S'int_shieldgenerator_size1_class3_fast' +S'int_shieldcellbank_size7_class1' p2611 a(dp2612 g6 -F1.3 +I80 saa(lp2613 -S'int_shieldgenerator_size1_class5' +S'int_shieldcellbank_size7_class2' p2614 a(dp2615 g6 -F1.3 +I32 saa(lp2616 -S'int_shieldgenerator_size1_class5_strong' +S'int_shieldcellbank_size7_class3' p2617 a(dp2618 g6 -F2.5 +I80 saa(lp2619 -S'int_shieldgenerator_size2_class1' +S'int_shieldcellbank_size7_class4' p2620 a(dp2621 g6 -F2.5 +I128 saa(lp2622 -S'int_shieldgenerator_size2_class2' +S'int_shieldcellbank_size7_class5' p2623 a(dp2624 g6 -I1 +I80 saa(lp2625 -S'int_shieldgenerator_size2_class3' +S'int_shieldcellbank_size8_class1' p2626 a(dp2627 g6 -F2.5 +I160 saa(lp2628 -S'int_shieldgenerator_size2_class3_fast' +S'int_shieldcellbank_size8_class2' p2629 a(dp2630 g6 -F2.5 +I64 saa(lp2631 -S'int_shieldgenerator_size2_class4' +S'int_shieldcellbank_size8_class3' p2632 a(dp2633 g6 -I4 +I160 saa(lp2634 -S'int_shieldgenerator_size2_class5' +S'int_shieldcellbank_size8_class4' p2635 a(dp2636 g6 -F2.5 +I256 saa(lp2637 -S'int_shieldgenerator_size2_class5_strong' +S'int_shieldcellbank_size8_class5' p2638 a(dp2639 g6 -I5 +I160 saa(lp2640 -S'int_shieldgenerator_size3_class1' +S'int_shieldgenerator_size1_class3_fast' p2641 a(dp2642 g6 -I5 +F1.3 saa(lp2643 -S'int_shieldgenerator_size3_class2' +S'int_shieldgenerator_size1_class5' p2644 a(dp2645 g6 -I2 +F1.3 saa(lp2646 -S'int_shieldgenerator_size3_class3' +S'int_shieldgenerator_size1_class5_strong' p2647 a(dp2648 g6 -I5 +F2.5 saa(lp2649 -S'int_shieldgenerator_size3_class3_fast' +S'int_shieldgenerator_size2_class1' p2650 a(dp2651 g6 -I5 +F2.5 saa(lp2652 -S'int_shieldgenerator_size3_class4' +S'int_shieldgenerator_size2_class2' p2653 a(dp2654 g6 -I8 +I1 saa(lp2655 -S'int_shieldgenerator_size3_class5' +S'int_shieldgenerator_size2_class3' p2656 a(dp2657 g6 -I5 +F2.5 saa(lp2658 -S'int_shieldgenerator_size3_class5_strong' +S'int_shieldgenerator_size2_class3_fast' p2659 a(dp2660 g6 -I10 +F2.5 saa(lp2661 -S'int_shieldgenerator_size4_class1' +S'int_shieldgenerator_size2_class4' p2662 a(dp2663 g6 -I10 +I4 saa(lp2664 -S'int_shieldgenerator_size4_class2' +S'int_shieldgenerator_size2_class5' p2665 a(dp2666 g6 -I4 +F2.5 saa(lp2667 -S'int_shieldgenerator_size4_class3' +S'int_shieldgenerator_size2_class5_strong' p2668 a(dp2669 g6 -I10 +I5 saa(lp2670 -S'int_shieldgenerator_size4_class3_fast' +S'int_shieldgenerator_size3_class1' p2671 a(dp2672 g6 -I10 +I5 saa(lp2673 -S'int_shieldgenerator_size4_class4' +S'int_shieldgenerator_size3_class2' p2674 a(dp2675 g6 -I16 +I2 saa(lp2676 -S'int_shieldgenerator_size4_class5' +S'int_shieldgenerator_size3_class3' p2677 a(dp2678 g6 -I10 +I5 saa(lp2679 -S'int_shieldgenerator_size4_class5_strong' +S'int_shieldgenerator_size3_class3_fast' p2680 a(dp2681 g6 -I20 +I5 saa(lp2682 -S'int_shieldgenerator_size5_class1' +S'int_shieldgenerator_size3_class4' p2683 a(dp2684 g6 -I20 +I8 saa(lp2685 -S'int_shieldgenerator_size5_class2' +S'int_shieldgenerator_size3_class5' p2686 a(dp2687 g6 -I8 +I5 saa(lp2688 -S'int_shieldgenerator_size5_class3' +S'int_shieldgenerator_size3_class5_strong' p2689 a(dp2690 g6 -I20 +I10 saa(lp2691 -S'int_shieldgenerator_size5_class3_fast' +S'int_shieldgenerator_size4_class1' p2692 a(dp2693 g6 -I20 +I10 saa(lp2694 -S'int_shieldgenerator_size5_class4' +S'int_shieldgenerator_size4_class2' p2695 a(dp2696 g6 -I32 +I4 saa(lp2697 -S'int_shieldgenerator_size5_class5' +S'int_shieldgenerator_size4_class3' p2698 a(dp2699 g6 -I20 +I10 saa(lp2700 -S'int_shieldgenerator_size5_class5_strong' +S'int_shieldgenerator_size4_class3_fast' p2701 a(dp2702 g6 -I40 +I10 saa(lp2703 -S'int_shieldgenerator_size6_class1' +S'int_shieldgenerator_size4_class4' p2704 a(dp2705 g6 -I40 +I16 saa(lp2706 -S'int_shieldgenerator_size6_class2' +S'int_shieldgenerator_size4_class5' p2707 a(dp2708 g6 -I16 +I10 saa(lp2709 -S'int_shieldgenerator_size6_class3' +S'int_shieldgenerator_size4_class5_strong' p2710 a(dp2711 g6 -I40 +I20 saa(lp2712 -S'int_shieldgenerator_size6_class3_fast' +S'int_shieldgenerator_size5_class1' p2713 a(dp2714 g6 -I40 +I20 saa(lp2715 -S'int_shieldgenerator_size6_class4' +S'int_shieldgenerator_size5_class2' p2716 a(dp2717 g6 -I64 +I8 saa(lp2718 -S'int_shieldgenerator_size6_class5' +S'int_shieldgenerator_size5_class3' p2719 a(dp2720 g6 -I40 +I20 saa(lp2721 -S'int_shieldgenerator_size6_class5_strong' +S'int_shieldgenerator_size5_class3_fast' p2722 a(dp2723 g6 -I80 +I20 saa(lp2724 -S'int_shieldgenerator_size7_class1' +S'int_shieldgenerator_size5_class4' p2725 a(dp2726 g6 -I80 +I32 saa(lp2727 -S'int_shieldgenerator_size7_class2' +S'int_shieldgenerator_size5_class5' p2728 a(dp2729 g6 -I32 +I20 saa(lp2730 -S'int_shieldgenerator_size7_class3' +S'int_shieldgenerator_size5_class5_strong' p2731 a(dp2732 g6 -I80 +I40 saa(lp2733 -S'int_shieldgenerator_size7_class3_fast' +S'int_shieldgenerator_size6_class1' p2734 a(dp2735 g6 -I80 +I40 saa(lp2736 -S'int_shieldgenerator_size7_class4' +S'int_shieldgenerator_size6_class2' p2737 a(dp2738 g6 -I128 +I16 saa(lp2739 -S'int_shieldgenerator_size7_class5' +S'int_shieldgenerator_size6_class3' p2740 a(dp2741 g6 -I80 +I40 saa(lp2742 -S'int_shieldgenerator_size7_class5_strong' +S'int_shieldgenerator_size6_class3_fast' p2743 a(dp2744 g6 -I160 +I40 saa(lp2745 -S'int_shieldgenerator_size8_class1' +S'int_shieldgenerator_size6_class4' p2746 a(dp2747 g6 -I160 +I64 saa(lp2748 -S'int_shieldgenerator_size8_class2' +S'int_shieldgenerator_size6_class5' p2749 a(dp2750 g6 -I64 +I40 saa(lp2751 -S'int_shieldgenerator_size8_class3' +S'int_shieldgenerator_size6_class5_strong' p2752 a(dp2753 g6 -I160 +I80 saa(lp2754 -S'int_shieldgenerator_size8_class3_fast' +S'int_shieldgenerator_size7_class1' p2755 a(dp2756 g6 -I160 +I80 saa(lp2757 -S'int_shieldgenerator_size8_class4' +S'int_shieldgenerator_size7_class2' p2758 a(dp2759 g6 -I256 +I32 saa(lp2760 -S'int_shieldgenerator_size8_class5' +S'int_shieldgenerator_size7_class3' p2761 a(dp2762 g6 -I160 +I80 saa(lp2763 -S'int_shieldgenerator_size8_class5_strong' +S'int_shieldgenerator_size7_class3_fast' p2764 a(dp2765 g6 -I320 +I80 saa(lp2766 -S'int_stellarbodydiscoveryscanner_advanced' +S'int_shieldgenerator_size7_class4' p2767 a(dp2768 g6 -I2 +I128 saa(lp2769 -S'int_stellarbodydiscoveryscanner_intermediate' +S'int_shieldgenerator_size7_class5' p2770 a(dp2771 g6 -I2 +I80 saa(lp2772 -S'int_stellarbodydiscoveryscanner_standard' +S'int_shieldgenerator_size7_class5_strong' p2773 a(dp2774 g6 -I2 +I160 saa(lp2775 -S'krait_mkii_armour_grade1' +S'int_shieldgenerator_size8_class1' p2776 a(dp2777 g6 -I0 +I160 saa(lp2778 -S'krait_mkii_armour_grade2' +S'int_shieldgenerator_size8_class2' p2779 a(dp2780 g6 -I36 +I64 saa(lp2781 -S'krait_mkii_armour_grade3' +S'int_shieldgenerator_size8_class3' p2782 a(dp2783 g6 -I67 +I160 saa(lp2784 -S'krait_mkii_armour_mirrored' +S'int_shieldgenerator_size8_class3_fast' p2785 a(dp2786 g6 -I67 +I160 saa(lp2787 -S'krait_mkii_armour_reactive' +S'int_shieldgenerator_size8_class4' p2788 a(dp2789 g6 -I67 +I256 saa(lp2790 -S'orca_armour_grade1' +S'int_shieldgenerator_size8_class5' p2791 a(dp2792 g6 -I0 +I160 saa(lp2793 -S'orca_armour_grade2' +S'int_shieldgenerator_size8_class5_strong' p2794 a(dp2795 g6 -I21 +I320 saa(lp2796 -S'orca_armour_grade3' +S'int_stellarbodydiscoveryscanner_advanced' p2797 a(dp2798 g6 -I87 +I2 saa(lp2799 -S'orca_armour_mirrored' +S'int_stellarbodydiscoveryscanner_intermediate' p2800 a(dp2801 g6 -I87 +I2 saa(lp2802 -S'orca_armour_reactive' +S'int_stellarbodydiscoveryscanner_standard' p2803 a(dp2804 g6 -I87 +I2 saa(lp2805 -S'python_armour_grade1' +S'krait_mkii_armour_grade1' p2806 a(dp2807 g6 I0 saa(lp2808 -S'python_armour_grade2' +S'krait_mkii_armour_grade2' p2809 a(dp2810 g6 -I26 +I36 saa(lp2811 -S'python_armour_grade3' +S'krait_mkii_armour_grade3' p2812 a(dp2813 g6 -I53 +I67 saa(lp2814 -S'python_armour_mirrored' +S'krait_mkii_armour_mirrored' p2815 a(dp2816 g6 -I53 +I67 saa(lp2817 -S'python_armour_reactive' +S'krait_mkii_armour_reactive' p2818 a(dp2819 g6 -I53 +I67 saa(lp2820 -S'sidewinder_armour_grade1' +S'orca_armour_grade1' p2821 a(dp2822 g6 I0 saa(lp2823 -S'sidewinder_armour_grade2' +S'orca_armour_grade2' p2824 a(dp2825 g6 -I2 +I21 saa(lp2826 -S'sidewinder_armour_grade3' +S'orca_armour_grade3' p2827 a(dp2828 g6 -I4 +I87 saa(lp2829 -S'sidewinder_armour_mirrored' +S'orca_armour_mirrored' p2830 a(dp2831 g6 -I4 +I87 saa(lp2832 -S'sidewinder_armour_reactive' +S'orca_armour_reactive' p2833 a(dp2834 g6 -I4 +I87 saa(lp2835 -S'type6_armour_grade1' +S'python_armour_grade1' p2836 a(dp2837 g6 I0 saa(lp2838 -S'type6_armour_grade2' +S'python_armour_grade2' p2839 a(dp2840 g6 -I12 +I26 saa(lp2841 -S'type6_armour_grade3' +S'python_armour_grade3' p2842 a(dp2843 g6 -I23 +I53 saa(lp2844 -S'type6_armour_mirrored' +S'python_armour_mirrored' p2845 a(dp2846 g6 -I23 +I53 saa(lp2847 -S'type6_armour_reactive' +S'python_armour_reactive' p2848 a(dp2849 g6 -I23 +I53 saa(lp2850 -S'type7_armour_grade1' +S'sidewinder_armour_grade1' p2851 a(dp2852 g6 I0 saa(lp2853 -S'type7_armour_grade2' +S'sidewinder_armour_grade2' p2854 a(dp2855 g6 -I32 +I2 saa(lp2856 -S'type7_armour_grade3' +S'sidewinder_armour_grade3' p2857 a(dp2858 g6 -I63 +I4 saa(lp2859 -S'type7_armour_mirrored' +S'sidewinder_armour_mirrored' p2860 a(dp2861 g6 -I63 +I4 saa(lp2862 -S'type7_armour_reactive' +S'sidewinder_armour_reactive' p2863 a(dp2864 g6 -I63 +I4 saa(lp2865 -S'type9_armour_grade1' +S'type6_armour_grade1' p2866 a(dp2867 g6 I0 saa(lp2868 -S'type9_armour_grade2' +S'type6_armour_grade2' p2869 a(dp2870 g6 -I75 +I12 saa(lp2871 -S'type9_armour_grade3' +S'type6_armour_grade3' p2872 a(dp2873 g6 -I150 +I23 saa(lp2874 -S'type9_armour_mirrored' +S'type6_armour_mirrored' p2875 a(dp2876 g6 -I150 +I23 saa(lp2877 -S'type9_armour_reactive' +S'type6_armour_reactive' p2878 a(dp2879 g6 -I150 +I23 saa(lp2880 -S'type9_military_armour_grade1' +S'type7_armour_grade1' p2881 a(dp2882 g6 I0 saa(lp2883 -S'type9_military_armour_grade2' +S'type7_armour_grade2' p2884 a(dp2885 g6 -I75 +I32 saa(lp2886 -S'type9_military_armour_grade3' +S'type7_armour_grade3' p2887 a(dp2888 g6 -I150 +I63 saa(lp2889 -S'type9_military_armour_mirrored' +S'type7_armour_mirrored' p2890 a(dp2891 g6 -I150 +I63 saa(lp2892 -S'type9_military_armour_reactive' +S'type7_armour_reactive' p2893 a(dp2894 g6 -I150 +I63 saa(lp2895 -S'typex_3_armour_grade1' +S'type9_armour_grade1' p2896 a(dp2897 g6 I0 saa(lp2898 -S'typex_3_armour_grade2' +S'type9_armour_grade2' p2899 a(dp2900 g6 -I40 +I75 saa(lp2901 -S'typex_3_armour_grade3' +S'type9_armour_grade3' p2902 a(dp2903 g6 -I78 +I150 saa(lp2904 -S'typex_3_armour_mirrored' +S'type9_armour_mirrored' p2905 a(dp2906 g6 -I78 +I150 saa(lp2907 -S'typex_3_armour_reactive' +S'type9_armour_reactive' p2908 a(dp2909 g6 -I78 +I150 saa(lp2910 -S'typex_armour_grade1' +S'type9_military_armour_grade1' p2911 a(dp2912 g6 I0 saa(lp2913 -S'typex_armour_grade2' +S'type9_military_armour_grade2' p2914 a(dp2915 g6 -I40 +I75 saa(lp2916 -S'typex_armour_grade3' +S'type9_military_armour_grade3' p2917 a(dp2918 g6 -I78 +I150 saa(lp2919 -S'typex_armour_mirrored' +S'type9_military_armour_mirrored' p2920 a(dp2921 g6 -I78 +I150 saa(lp2922 -S'typex_armour_reactive' +S'type9_military_armour_reactive' p2923 a(dp2924 g6 -I78 +I150 saa(lp2925 -S'viper_armour_grade1' +S'typex_3_armour_grade1' p2926 a(dp2927 g6 I0 saa(lp2928 -S'viper_armour_grade2' +S'typex_3_armour_grade2' p2929 a(dp2930 g6 -I5 +I40 saa(lp2931 -S'viper_armour_grade3' +S'typex_3_armour_grade3' p2932 a(dp2933 g6 -I9 +I78 saa(lp2934 -S'viper_armour_mirrored' +S'typex_3_armour_mirrored' p2935 a(dp2936 g6 -I9 +I78 saa(lp2937 -S'viper_armour_reactive' +S'typex_3_armour_reactive' p2938 a(dp2939 g6 -I9 +I78 saa(lp2940 -S'viper_mkiv_armour_grade1' +S'typex_armour_grade1' p2941 a(dp2942 g6 I0 saa(lp2943 -S'viper_mkiv_armour_grade2' +S'typex_armour_grade2' p2944 a(dp2945 g6 -I5 +I40 saa(lp2946 -S'viper_mkiv_armour_grade3' +S'typex_armour_grade3' p2947 a(dp2948 g6 -I9 +I78 saa(lp2949 -S'viper_mkiv_armour_mirrored' +S'typex_armour_mirrored' p2950 a(dp2951 g6 -I9 +I78 saa(lp2952 -S'viper_mkiv_armour_reactive' +S'typex_armour_reactive' p2953 a(dp2954 g6 -I9 +I78 saa(lp2955 -S'vulture_armour_grade1' +S'viper_armour_grade1' p2956 a(dp2957 g6 I0 saa(lp2958 -S'vulture_armour_grade2' +S'viper_armour_grade2' p2959 a(dp2960 g6 -I17 +I5 saa(lp2961 -S'vulture_armour_grade3' +S'viper_armour_grade3' p2962 a(dp2963 g6 -I35 +I9 saa(lp2964 -S'vulture_armour_mirrored' +S'viper_armour_mirrored' p2965 a(dp2966 g6 -I35 +I9 saa(lp2967 -S'vulture_armour_reactive' +S'viper_armour_reactive' p2968 a(dp2969 g6 +I9 +saa(lp2970 +S'viper_mkiv_armour_grade1' +p2971 +a(dp2972 +g6 +I0 +saa(lp2973 +S'viper_mkiv_armour_grade2' +p2974 +a(dp2975 +g6 +I5 +saa(lp2976 +S'viper_mkiv_armour_grade3' +p2977 +a(dp2978 +g6 +I9 +saa(lp2979 +S'viper_mkiv_armour_mirrored' +p2980 +a(dp2981 +g6 +I9 +saa(lp2982 +S'viper_mkiv_armour_reactive' +p2983 +a(dp2984 +g6 +I9 +saa(lp2985 +S'vulture_armour_grade1' +p2986 +a(dp2987 +g6 +I0 +saa(lp2988 +S'vulture_armour_grade2' +p2989 +a(dp2990 +g6 +I17 +saa(lp2991 +S'vulture_armour_grade3' +p2992 +a(dp2993 +g6 I35 -saatRp2970 +saa(lp2994 +S'vulture_armour_mirrored' +p2995 +a(dp2996 +g6 +I35 +saa(lp2997 +S'vulture_armour_reactive' +p2998 +a(dp2999 +g6 +I35 +saatRp3000 . \ No newline at end of file diff --git a/outfitting.py b/outfitting.py index 76621e6f..87c9a1e2 100644 --- a/outfitting.py +++ b/outfitting.py @@ -337,16 +337,11 @@ def lookup(module, ship_map, entitled=False): new['class'] = '1' new['rating'] = 'I' - # Skip uninteresting stuff + # Skip uninteresting stuff - no longer present in ED 3.1 cAPI data elif name[0] in ['bobble', 'decal', 'nameplate', 'paintjob', 'enginecustomisation', 'weaponcustomisation'] or name[1].startswith('shipkit') : return None - # Skip PP-specific modules in outfitting which have an sku like ELITE_SPECIFIC_V_POWER_100100 - # Arghh - Bi-Weave Shield generators are incorrectly listed as 'powerplay' ! - # elif 'category' in module and module['category'].lower() == 'powerplay': - # return None - - # Shouldn't be listing player-specific paid stuff in outfitting, other than Horizons + # Shouldn't be listing player-specific paid stuff or broker/powerplay-specific modules in outfitting, other than Horizons elif not entitled and module.get('sku') and module['sku'] != 'ELITE_HORIZONS_V_PLANETARY_LANDINGS': return None @@ -448,11 +443,8 @@ def lookup(module, ship_map, entitled=False): # Entitlements if not module.get('sku'): pass - elif module['sku'].startswith('ELITE_SPECIFIC_V_POWER'): - new['entitlement'] = 'powerplay' else: - assert module['sku'] == 'ELITE_HORIZONS_V_PLANETARY_LANDINGS', '%s: Unknown sku "%s"' % (module['id'], module['sku']) - new['entitlement'] = 'horizons' + new['entitlement'] = module['sku'] # Extra module data if module['name'].endswith('_free'):