From 934593fe2af0466cc2e1be2db1c71a327de6290b Mon Sep 17 00:00:00 2001 From: felixlinker Date: Fri, 20 Sep 2019 15:55:21 +0200 Subject: [PATCH] Migrate changes of https://github.com/EDCD/coriolis-data/commit/87fc3b6cbb31197f699f1caf69fd490eeec315c1 --- src/app/components/ModificationsMenu.jsx | 4 ++-- src/app/shipyard/Module.js | 6 +++--- src/app/utils/BlueprintFunctions.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/components/ModificationsMenu.jsx b/src/app/components/ModificationsMenu.jsx index 8ca36326..8a6f13d3 100644 --- a/src/app/components/ModificationsMenu.jsx +++ b/src/app/components/ModificationsMenu.jsx @@ -178,7 +178,7 @@ export default class ModificationsMenu extends TranslatedComponent { continue; } const classes = cn('button-inline-menu', { - active: m.blueprint && m.blueprint.special && m.blueprint.special.edname == specialName + active: m.blueprint && m.blueprint.special && m.blueprint.special.key == specialName }); if (classes.indexOf('active') >= 0) this.selectedSpecialId = specialName; const close = this._specialSelected.bind(this, specialName); @@ -437,7 +437,7 @@ export default class ModificationsMenu extends TranslatedComponent { let specialTt; if (m.blueprint && m.blueprint.special) { specialLabel = m.blueprint.special.name; - specialTt = specialToolTip(translate, m.blueprint.grades[m.blueprint.grade], m.grp, m, m.blueprint.special.edname); + specialTt = specialToolTip(translate, m.blueprint.grades[m.blueprint.grade], m.grp, m, m.blueprint.special.key); } else { specialLabel = translate('PHRASE_SELECT_SPECIAL'); } diff --git a/src/app/shipyard/Module.js b/src/app/shipyard/Module.js index 22466f93..e34bf081 100755 --- a/src/app/shipyard/Module.js +++ b/src/app/shipyard/Module.js @@ -46,7 +46,7 @@ export default class Module { if ((!raw) && this.blueprint && this.blueprint.special) { // This module has a special effect, see if we need to alter our returned value - const modifierActions = Modifications.modifierActions[this.blueprint.special.edname]; + const modifierActions = Modifications.modifierActions[this.blueprint.special.key]; if (modifierActions && modifierActions[name]) { // this special effect modifies our returned value const modification = Modifications.modifications[name]; @@ -83,7 +83,7 @@ export default class Module { } if (valueiswithspecial && this.blueprint && this.blueprint.special) { // This module has a special effect, see if we need to alter the stored value - const modifierActions = Modifications.modifierActions[this.blueprint.special.edname]; + const modifierActions = Modifications.modifierActions[this.blueprint.special.key]; if (modifierActions && modifierActions[name]) { // This special effect modifies the value being set, so we need to revert it prior to storing the value const modification = Modifications.modifications[name]; @@ -816,7 +816,7 @@ export default class Module { if (clipSize) { // If auto-loader is applied, effective clip size will be nearly doubled // as you get one reload for every two shots fired. - if (this.blueprint && this.blueprint.special && this.blueprint.special.edname === 'special_auto_loader' && modified) { + if (this.blueprint && this.blueprint.special && this.blueprint.special.key === 'special_auto_loader' && modified) { clipSize += clipSize - 1; } diff --git a/src/app/utils/BlueprintFunctions.js b/src/app/utils/BlueprintFunctions.js index 8fbe2fb4..f29de67d 100644 --- a/src/app/utils/BlueprintFunctions.js +++ b/src/app/utils/BlueprintFunctions.js @@ -156,7 +156,7 @@ export function blueprintTooltip(translate, blueprint, engineers, grp, m) { // We also add in any benefits from specials that aren't covered above if (m.blueprint && m.blueprint.special) { - for (const feature in Modifications.modifierActions[m.blueprint.special.edname]) { + for (const feature in Modifications.modifierActions[m.blueprint.special.key]) { if (!blueprint.features[feature] && !m.mods.feature) { const featureDef = Modifications.modifications[feature]; if (featureDef && !featureDef.hidden) {