diff --git a/coriolis-data b/coriolis-data index ee4ffc01..4e928021 160000 --- a/coriolis-data +++ b/coriolis-data @@ -1 +1 @@ -Subproject commit ee4ffc011600201b791e4bcbff62e162cb9cb958 +Subproject commit 4e928021564105b18736e49eedca8e9e57ae13ea diff --git a/coriolis.py b/coriolis.py index 2b79b231..52e176c5 100755 --- a/coriolis.py +++ b/coriolis.py @@ -80,21 +80,6 @@ if __name__ == "__main__": add(modules, 'int_stellarbodydiscoveryscanner_intermediate', { 'mass': 2 }) add(modules, 'int_stellarbodydiscoveryscanner_advanced', { 'mass': 2 }) - # 3.3 additions not yet present in coriolis-data - add(modules, 'hpt_mining_subsurfdispmisle_fixed_small', { 'mass': 2 }) - add(modules, 'hpt_mining_subsurfdispmisle_turret_small', { 'mass': 2 }) - add(modules, 'hpt_mining_subsurfdispmisle_fixed_medium', { 'mass': 4 }) - add(modules, 'hpt_mining_subsurfdispmisle_turret_medium', { 'mass': 4 }) - add(modules, 'hpt_mining_abrblstr_fixed_small', { 'mass': 2 }) - add(modules, 'hpt_mining_abrblstr_turret_small', { 'mass': 2 }) - add(modules, 'hpt_mining_seismchrgwarhd_fixed_medium', { 'mass': 4 }) - add(modules, 'hpt_mining_seismchrgwarhd_turret_medium', { 'mass': 4 }) - add(modules, 'hpt_mrascanner_size0_class1', { 'mass': 1.3 }) - add(modules, 'hpt_mrascanner_size0_class2', { 'mass': 1.3 }) - add(modules, 'hpt_mrascanner_size0_class3', { 'mass': 1.3 }) - add(modules, 'hpt_mrascanner_size0_class4', { 'mass': 1.3 }) - add(modules, 'hpt_mrascanner_size0_class5', { 'mass': 1.3 }) - modules = OrderedDict([(k,modules[k]) for k in sorted(modules)]) # sort for easier diffing cPickle.dump(modules, open('modules.p', 'wb')) diff --git a/outfitting.py b/outfitting.py index 59e21e98..25a79740 100644 --- a/outfitting.py +++ b/outfitting.py @@ -63,6 +63,8 @@ missiletype_map = { 'causticmissile' : 'Dumbfire', 'drunkmissilerack' : 'Swarm', 'dumbfiremissilerack' : 'Dumbfire', + 'mining_subsurfdispmisle' : 'Seeker', + 'mining_seismchrgwarhd' : 'Seeker', } weaponmount_map = {