From 9e6bf6c2a8dc92ccac7a8188536dfb3f5c9abea2 Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Thu, 12 Jan 2017 02:47:15 +0000 Subject: [PATCH] 2.2.03 module and ship stats from coriolis-data --- coriolis-data | 2 +- coriolis.py | 9 +++++++-- modules.p | Bin 21732 -> 21973 bytes ships.p | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/coriolis-data b/coriolis-data index d4ffc020..648cd56e 160000 --- a/coriolis-data +++ b/coriolis-data @@ -1 +1 @@ -Subproject commit d4ffc0202a929d25eb2056b1af00030a59a4512a +Subproject commit 648cd56e5e6833bde2da49f6bc259c578d6a37e9 diff --git a/coriolis.py b/coriolis.py index 0e105c30..1ca9d333 100755 --- a/coriolis.py +++ b/coriolis.py @@ -252,7 +252,7 @@ if __name__ == "__main__": 'Viper Mk IV' : 'Viper MkIV', } - # From https://github.com/cmmcleod/coriolis/blob/master/src/app/shipyard/Constants.js + # From https://github.com/EDCD/coriolis/blob/master/src/app/shipyard/Constants.js ModuleGroupToName = { # Standard 'pp' : 'Power Plant', @@ -281,6 +281,7 @@ if __name__ == "__main__": 'psg' : 'Prismatic Shield Generator', 'dc' : 'Docking Computer', 'fx' : 'Fuel Transfer Limpet Controller', + 'mrp' : 'Module Reinforcement Package', 'pc' : 'Prospector Limpet Controller', 'pce' : 'Economy Class Passenger Cabin', 'pci' : 'Business Class Passenger Cabin', @@ -292,15 +293,19 @@ if __name__ == "__main__": 'bl' : 'Beam Laser', 'ul' : 'Burst Laser', 'c' : 'Cannon', + 'ch' : 'Chaff Launcher', 'cs' : 'Cargo Scanner', 'cm' : 'Countermeasure', + 'ec' : 'Electronic Countermeasure', 'fc' : 'Fragment Cannon', + 'hs' : 'Heat Sink Launcher', 'ws' : 'Frame Shift Wake Scanner', 'kw' : 'Kill Warrant Scanner', 'nl' : 'Mine Launcher', 'ml' : 'Mining Laser', 'mr' : 'Missile Rack', 'pa' : 'Plasma Accelerator', + 'po' : 'Point Defence', 'mc' : 'Multi-cannon', 'pl' : 'Pulse Laser', 'rg' : 'Rail Gun', @@ -325,7 +330,7 @@ if __name__ == "__main__": for cat in data['Modules'].values(): for grp, mlist in cat.iteritems(): for m in mlist: - key = ('name' in m and specials[(ModuleGroupToName[grp], m['name'])] or specials.get((ModuleGroupToName[grp], None), ModuleGroupToName[grp]), + key = (specials.get((ModuleGroupToName[grp], m.get('name'))) or ModuleGroupToName[grp], None, str(m['class']), str(m['rating'])) diff --git a/modules.p b/modules.p index fcee20f4c4d8a1b0db8f02a7854a93d667603db5..ef7489dc27da9bbe30de9d1668ee61e7bb23f829 100644 GIT binary patch literal 21973 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

hTt>y8q@qo7FU>y-qWeG^PxD{$ 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 Ld9J7H;bZ;})N<$? diff --git a/ships.p b/ships.p index bfda0d3b..d4f90a79 100644 --- a/ships.p +++ b/ships.p @@ -1,5 +1,5 @@ €}q(UFederal Assault Shipq}qUhullMassqMàsU Viper MkIVq}qhK¾sUFederal Gunshipq}qhMDsU Viper MkIIIq }q -hKhK–su. \ No newline at end of file