Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-08 22:33:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/chieftain' into develop

Browse Source
This commit is contained in:
Unknown
2018-01-27 11:47:17 +00:00
parent b7b8ee5580 4378f0020e
commit f6f057689c
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/utils/CompanionApiUtils.js
View File

@@ -36,6 +36,7 @@ const SHIP_FD_NAME_TO_CORIOLIS_NAME = {
'Type7': 'type_7_transport',
'Type9': 'type_9_heavy',
'Type9_Military': 'type_10_defender',
'TypeX': 'alliance_chieftain',
'Viper': 'viper',
'Viper_MkIV': 'viper_mk_iv',
'Vulture': 'vulture'
@@ -315,8 +316,6 @@ export function shipFromJson(json) {
*/
function _addModifications(module, modifiers, blueprint, grade, specialModifications) {
if (!modifiers) return;
console.log(module);
console.log(modifiers);
let special;
if (specialModifications) {
special = Modifications.specials[Object.keys(specialModifications)[0]]