ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-18 09:57:40 +03:00
Code Issues Projects Releases Wiki Activity

Add 3.4 modules

Browse Source
This commit is contained in:
Jonathan Harris 2019-04-26 13:45:21 +01:00
parent 569bb0d834
commit 2f8b04db87
4 changed files with 1526 additions and 1510 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coriolis-data

@ -1 +1 @@
Subproject commit 4e928021564105b18736e49eedca8e9e57ae13ea Subproject commit a493df6f6b558c4d43e61781c5c40024e3b38b43

4
coriolis.py
View File

@ -80,6 +80,10 @@ if __name__ == "__main__":
add(modules, 'int_stellarbodydiscoveryscanner_intermediate', { 'mass': 2 }) add(modules, 'int_stellarbodydiscoveryscanner_intermediate', { 'mass': 2 })
add(modules, 'int_stellarbodydiscoveryscanner_advanced', { 'mass': 2 }) add(modules, 'int_stellarbodydiscoveryscanner_advanced', { 'mass': 2 })
# Missing
add(modules, 'hpt_mining_subsurfdispmisle_fixed_small', { 'mass': 2 })
add(modules, 'hpt_mining_subsurfdispmisle_fixed_medium', { 'mass': 4 })
modules = OrderedDict([(k,modules[k]) for k in sorted(modules)]) # sort for easier diffing modules = OrderedDict([(k,modules[k]) for k in sorted(modules)]) # sort for easier diffing
cPickle.dump(modules, open('modules.p', 'wb')) cPickle.dump(modules, open('modules.p', 'wb'))

3016
modules.p
View File

File diff suppressed because it is too large Load Diff

14
outfitting.py
View File

@ -277,10 +277,13 @@ fighter_rating_map = {
misc_internal_map = { misc_internal_map = {
('detailedsurfacescanner', 'tiny') : ('Detailed Surface Scanner', 'C'), ('detailedsurfacescanner', 'tiny') : ('Detailed Surface Scanner', 'C'),
('dockingcomputer', 'advanced') : ('Advanced Docking Computer', 'E'),
('dockingcomputer', 'standard') : ('Standard Docking Computer', 'E'), ('dockingcomputer', 'standard') : ('Standard Docking Computer', 'E'),
'planetapproachsuite' : ('Planetary Approach Suite', 'I'),
('stellarbodydiscoveryscanner', 'standard') : ('Basic Discovery Scanner', 'E'), ('stellarbodydiscoveryscanner', 'standard') : ('Basic Discovery Scanner', 'E'),
('stellarbodydiscoveryscanner', 'intermediate') : ('Intermediate Discovery Scanner', 'D'), ('stellarbodydiscoveryscanner', 'intermediate') : ('Intermediate Discovery Scanner', 'D'),
('stellarbodydiscoveryscanner', 'advanced') : ('Advanced Discovery Scanner', 'C'), ('stellarbodydiscoveryscanner', 'advanced') : ('Advanced Discovery Scanner', 'C'),
'supercruiseassist' : ('Supercruise Assist', 'E'),
} }
standard_map = { standard_map = {
@ -421,14 +424,11 @@ def lookup(module, ship_map, entitled=False):
elif name[0]!='int': elif name[0]!='int':
raise AssertionError('%s: Unknown prefix "%s"' % (module['id'], name[0])) raise AssertionError('%s: Unknown prefix "%s"' % (module['id'], name[0]))
# Horizons Planetary Approach Suite - only listed in outfitting if the user is *playing* Horizons # Miscellaneous Class 1 - e.g. Int_PlanetApproachSuite, Int_StellarBodyDiscoveryScanner_Advanced, Int_DockingComputer_Standard
elif name[1] == 'planetapproachsuite': elif name[1] in misc_internal_map:
new['category'] = 'standard' new['category'] = 'internal'
new['name'] = 'Planetary Approach Suite' new['name'], new['rating'] = misc_internal_map[name[1]]
new['class'] = '1' new['class'] = '1'
new['rating'] = 'I'
# Miscellaneous Class 1 - e.g. Int_StellarBodyDiscoveryScanner_Advanced, Int_DockingComputer_Standard
elif len(name) > 2 and (name[1],name[2]) in misc_internal_map: elif len(name) > 2 and (name[1],name[2]) in misc_internal_map:
# Reported category is not necessarily helpful. e.g. "Int_DockingComputer_Standard" has category "utility" # Reported category is not necessarily helpful. e.g. "Int_DockingComputer_Standard" has category "utility"
new['category'] = 'internal' new['category'] = 'internal'