diff --git a/coriolis.py b/coriolis.py index fa14c09c..4f4adfaa 100755 --- a/coriolis.py +++ b/coriolis.py @@ -175,6 +175,7 @@ if __name__ == "__main__": modules[('AX Multi-Cannon', None, '2', 'E')] = {'mass': 4} modules[('AX Multi-Cannon', None, '2', 'F')] = {'mass': 4} modules[('Remote Release Flak Launcher', None, '2', 'B')] = {'mass': 4} + modules[('Shutdown Field Neutraliser', None, '0', 'F')] = {'mass': 1.3} modules[('Xeno Scanner', None, '0', 'E')] = {'mass': 1.3} modules = OrderedDict([(k,modules[k]) for k in sorted(modules)]) # sort for easier diffing diff --git a/modules.p b/modules.p index cd249308..b60a2f02 100644 --- a/modules.p +++ b/modules.p @@ -7148,320 +7148,329 @@ a(dp2577 g7 I2 saa(lp2578 -(S'Standard Docking Computer' +(S'Shutdown Field Neutraliser' p2579 -NS'1' -S'E' +NS'0' +S'F' tp2580 a(dp2581 g7 -I0 +F1.3 saa(lp2582 -(S'Thrusters' +(S'Standard Docking Computer' p2583 -NS'2' -S'A' +NS'1' +S'E' tp2584 a(dp2585 g7 -F2.5 +I0 saa(lp2586 -(g2583 +(S'Thrusters' +p2587 +NS'2' +S'A' +tp2588 +a(dp2589 +g7 +F2.5 +saa(lp2590 +(g2587 NS'2' S'B' -tp2587 -a(dp2588 +tp2591 +a(dp2592 g7 I4 -saa(lp2589 -(g2583 +saa(lp2593 +(g2587 NS'2' S'C' -tp2590 -a(dp2591 +tp2594 +a(dp2595 g7 F2.5 -saa(lp2592 -(g2583 +saa(lp2596 +(g2587 NS'2' S'D' -tp2593 -a(dp2594 +tp2597 +a(dp2598 g7 I1 -saa(lp2595 -(g2583 +saa(lp2599 +(g2587 NS'2' S'E' -tp2596 -a(dp2597 +tp2600 +a(dp2601 g7 F2.5 -saa(lp2598 -(g2583 +saa(lp2602 +(g2587 NS'3' S'A' -tp2599 -a(dp2600 +tp2603 +a(dp2604 g7 I5 -saa(lp2601 -(g2583 +saa(lp2605 +(g2587 NS'3' S'B' -tp2602 -a(dp2603 +tp2606 +a(dp2607 g7 I8 -saa(lp2604 -(g2583 +saa(lp2608 +(g2587 NS'3' S'C' -tp2605 -a(dp2606 +tp2609 +a(dp2610 g7 I5 -saa(lp2607 -(g2583 +saa(lp2611 +(g2587 NS'3' S'D' -tp2608 -a(dp2609 +tp2612 +a(dp2613 g7 I2 -saa(lp2610 -(g2583 +saa(lp2614 +(g2587 NS'3' S'E' -tp2611 -a(dp2612 +tp2615 +a(dp2616 g7 I5 -saa(lp2613 -(g2583 +saa(lp2617 +(g2587 NS'4' S'A' -tp2614 -a(dp2615 +tp2618 +a(dp2619 g7 I10 -saa(lp2616 -(g2583 +saa(lp2620 +(g2587 NS'4' S'B' -tp2617 -a(dp2618 +tp2621 +a(dp2622 g7 I16 -saa(lp2619 -(g2583 +saa(lp2623 +(g2587 NS'4' S'C' -tp2620 -a(dp2621 +tp2624 +a(dp2625 g7 I10 -saa(lp2622 -(g2583 +saa(lp2626 +(g2587 NS'4' S'D' -tp2623 -a(dp2624 +tp2627 +a(dp2628 g7 I4 -saa(lp2625 -(g2583 +saa(lp2629 +(g2587 NS'4' S'E' -tp2626 -a(dp2627 +tp2630 +a(dp2631 g7 I10 -saa(lp2628 -(g2583 +saa(lp2632 +(g2587 NS'5' S'A' -tp2629 -a(dp2630 +tp2633 +a(dp2634 g7 I20 -saa(lp2631 -(g2583 +saa(lp2635 +(g2587 NS'5' S'B' -tp2632 -a(dp2633 +tp2636 +a(dp2637 g7 I32 -saa(lp2634 -(g2583 +saa(lp2638 +(g2587 NS'5' S'C' -tp2635 -a(dp2636 +tp2639 +a(dp2640 g7 I20 -saa(lp2637 -(g2583 +saa(lp2641 +(g2587 NS'5' S'D' -tp2638 -a(dp2639 +tp2642 +a(dp2643 g7 I8 -saa(lp2640 -(g2583 +saa(lp2644 +(g2587 NS'5' S'E' -tp2641 -a(dp2642 +tp2645 +a(dp2646 g7 I20 -saa(lp2643 -(g2583 +saa(lp2647 +(g2587 NS'6' S'A' -tp2644 -a(dp2645 +tp2648 +a(dp2649 g7 I40 -saa(lp2646 -(g2583 +saa(lp2650 +(g2587 NS'6' S'B' -tp2647 -a(dp2648 +tp2651 +a(dp2652 g7 I64 -saa(lp2649 -(g2583 +saa(lp2653 +(g2587 NS'6' S'C' -tp2650 -a(dp2651 +tp2654 +a(dp2655 g7 I40 -saa(lp2652 -(g2583 +saa(lp2656 +(g2587 NS'6' S'D' -tp2653 -a(dp2654 +tp2657 +a(dp2658 g7 I16 -saa(lp2655 -(g2583 +saa(lp2659 +(g2587 NS'6' S'E' -tp2656 -a(dp2657 +tp2660 +a(dp2661 g7 I40 -saa(lp2658 -(g2583 +saa(lp2662 +(g2587 NS'7' S'A' -tp2659 -a(dp2660 +tp2663 +a(dp2664 g7 I80 -saa(lp2661 -(g2583 +saa(lp2665 +(g2587 NS'7' S'B' -tp2662 -a(dp2663 +tp2666 +a(dp2667 g7 I128 -saa(lp2664 -(g2583 +saa(lp2668 +(g2587 NS'7' S'C' -tp2665 -a(dp2666 +tp2669 +a(dp2670 g7 I80 -saa(lp2667 -(g2583 +saa(lp2671 +(g2587 NS'7' S'D' -tp2668 -a(dp2669 +tp2672 +a(dp2673 g7 I32 -saa(lp2670 -(g2583 +saa(lp2674 +(g2587 NS'7' S'E' -tp2671 -a(dp2672 +tp2675 +a(dp2676 g7 I80 -saa(lp2673 -(g2583 +saa(lp2677 +(g2587 NS'8' S'A' -tp2674 -a(dp2675 +tp2678 +a(dp2679 g7 I160 -saa(lp2676 -(g2583 +saa(lp2680 +(g2587 NS'8' S'B' -tp2677 -a(dp2678 +tp2681 +a(dp2682 g7 I256 -saa(lp2679 -(g2583 +saa(lp2683 +(g2587 NS'8' S'C' -tp2680 -a(dp2681 +tp2684 +a(dp2685 g7 I160 -saa(lp2682 -(g2583 +saa(lp2686 +(g2587 NS'8' S'D' -tp2683 -a(dp2684 +tp2687 +a(dp2688 g7 I64 -saa(lp2685 -(g2583 +saa(lp2689 +(g2587 NS'8' S'E' -tp2686 -a(dp2687 -g7 -I160 -saa(lp2688 -(S'Torpedo Pylon' -p2689 -NS'1' -S'I' tp2690 a(dp2691 g7 -I2 +I160 saa(lp2692 -(g2689 +(S'Torpedo Pylon' +p2693 +NS'1' +S'I' +tp2694 +a(dp2695 +g7 +I2 +saa(lp2696 +(g2693 NS'2' S'I' -tp2693 -a(dp2694 -g7 -I4 -saa(lp2695 -(S'Xeno Scanner' -p2696 -NS'0' -S'E' tp2697 a(dp2698 g7 +I4 +saa(lp2699 +(S'Xeno Scanner' +p2700 +NS'0' +S'E' +tp2701 +a(dp2702 +g7 F1.3 -saatRp2699 +saatRp2703 . \ No newline at end of file diff --git a/outfitting.py b/outfitting.py index 74842601..7adbfd67 100644 --- a/outfitting.py +++ b/outfitting.py @@ -171,6 +171,7 @@ weaponoldvariant_map = { } countermeasure_map = { + 'antiunknownshutdown' : ('Shutdown Field Neutraliser', 'F'), 'chafflauncher' : ('Chaff Launcher', 'I'), 'electroniccountermeasure' : ('Electronic Countermeasure', 'F'), 'heatsinklauncher' : ('Heat Sink Launcher', 'I'),