ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 08:17:13 +03:00
Code Issues Projects Releases Wiki Activity

Add new 1.6/2.1 modules

Browse Source 
Fixes #113
This commit is contained in:
Jonathan Harris 2016-06-03 18:49:41 +01:00
parent d1756ebcf5
commit 4cf2b8706c
No known key found for this signature in database
GPG Key ID: D997C6582365A060
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coriolis-data

@ -1 +1 @@
Subproject commit d68f37d39a8b21a37167aa92d962d21376b8bab9
Subproject commit 3604982648377f42eff4a15fa1c1962e1ff45241

1
coriolis.py
View File

@ -76,6 +76,7 @@ fixup_map.update({
'Advanced Plasma Accelerator' : ('Plasma Accelerator', 'Advanced Plasma Accelerator'),
'Cytoscrambler Burst Laser' : ('Burst Laser', 'Cytoscrambler'),
'Enforcer Cannon' : ('Multi-cannon', 'Enforcer'),
'Enhanced Performance Thrusters': ('Thrusters', 'Enhanced Performance Thrusters'),
'Imperial Hammer Rail Gun' : ('Rail Gun', 'Imperial Hammer'),
'Mining Lance Beam Laser' : ('Mining Laser', 'Mining Lance'),
'Multi-Cannon' : ('Multi-cannon', None),

BIN
modules.p
View File

Binary file not shown.

13
outfitting.py
View File

@ -73,9 +73,11 @@ weaponrating_map = {
'hpt_beamlaser_fixed_small' : 'E',
'hpt_beamlaser_fixed_medium' : 'D',
'hpt_beamlaser_fixed_large': 'C',
'hpt_beamlaser_fixed_huge': 'A',
'hpt_beamlaser_gimbal_small': 'E',
'hpt_beamlaser_gimbal_medium': 'D',
'hpt_beamlaser_gimbal_large': 'C',
'hpt_beamlaser_gimbal_huge': 'A',
'hpt_beamlaser_turret_small': 'F',
'hpt_beamlaser_turret_medium': 'E',
'hpt_beamlaser_turret_large': 'D',
@ -99,8 +101,12 @@ weaponrating_map = {
'hpt_mininglaser_fixed_medium': 'D',
'hpt_multicannon_fixed_small': 'F',
'hpt_multicannon_fixed_medium': 'E',
'hpt_multicannon_fixed_large': 'C',
'hpt_multicannon_fixed_huge': 'A',
'hpt_multicannon_gimbal_small': 'G',
'hpt_multicannon_gimbal_medium': 'F',
'hpt_multicannon_gimbal_large': 'C',
'hpt_multicannon_gimbal_huge': 'A',
'hpt_multicannon_turret_small': 'G',
'hpt_multicannon_turret_medium': 'F',
'hpt_plasmaaccelerator_fixed_medium': 'C',
@ -109,9 +115,11 @@ weaponrating_map = {
'hpt_pulselaser_fixed_small': 'F',
'hpt_pulselaser_fixed_medium': 'E',
'hpt_pulselaser_fixed_large': 'D',
'hpt_pulselaser_fixed_huge': 'A',
'hpt_pulselaser_gimbal_small': 'G',
'hpt_pulselaser_gimbal_medium': 'F',
'hpt_pulselaser_gimbal_large': 'E',
'hpt_pulselaser_gimbal_huge': 'A',
'hpt_pulselaser_turret_small': 'G',
'hpt_pulselaser_turret_medium': 'F',
'hpt_pulselaser_turret_large': 'F',
@ -184,6 +192,7 @@ misc_internal_map = {
standard_map = {
# 'armour' : handled separately
'engine' : 'Thrusters',
('engine','fast') : 'Enhanced Performance Thrusters',
'fueltank' : 'Fuel Tank',
'hyperdrive' : 'Frame Shift Drive',
'lifesupport' : 'Life Support',
@ -264,10 +273,10 @@ def lookup(module, ship_map, entitled=False):
new['rating'] = '?'
else: # PP faction-specific weapons e.g. Hpt_Slugshot_Fixed_Large_Range
new['name'] = weapon_map[(name[1],name[4])]
new['rating'] = weaponrating_map.get(('_').join(name[:4]), '?') # assumes same rating as base weapon
new['rating'] = weaponrating_map['_'.join(name[:4])] # assumes same rating as base weapon
else:
new['name'] = weapon_map[name[1]]
new['rating'] = weaponrating_map.get(module['name'].lower(), '?') # no obvious rule - needs lookup table
new['rating'] = weaponrating_map[module['name'].lower()] # no obvious rule - needs lookup table
new['mount'] = weaponmount_map[name[2]]
if name[1] in missiletype_map: # e.g. Hpt_DumbfireMissileRack_Fixed_Small
new['guidance'] = missiletype_map[name[1]]