Merge pull request #63 from Brighter-Applications/issues/776_Fix_Overcharged_Blueprint

Fixes Blueprint selection issue caused by fixing overcharged_blueprint.
This commit is contained in:
Alex Williams
2024-11-23 21:06:01 +00:00
committed by GitHub

View File

@@ -422,10 +422,12 @@ export default class ModificationsMenu extends TranslatedComponent {
let haveBlueprint = false; let haveBlueprint = false;
let blueprintTt; let blueprintTt;
let blueprintCv; let blueprintCv;
let bprintSearchName;
// Set the bprintSearchName value to the fdname of the blueprint for this module
let bprintSearchName = m.blueprint.fdname;
// If the fdname is Weapon_Overcharged, we need to check if it's an MC // If the fdname is Weapon_Overcharged, we need to check if it's an MC
if (m.blueprint && m.blueprint.fdname) {
// Set the bprintSearchName value to the fdname of the blueprint for this module
bprintSearchName = m.blueprint.fdname;
if (m.blueprint.fdname === 'Weapon_Overcharged') { if (m.blueprint.fdname === 'Weapon_Overcharged') {
// If the module is a MultiCannon, we need to fix the blueprint search name, else it will find the Laser Weapon_Overcharged Blueprint and not the MC Weapon_Overcharged Blueprint // If the module is a MultiCannon, we need to fix the blueprint search name, else it will find the Laser Weapon_Overcharged Blueprint and not the MC Weapon_Overcharged Blueprint
if (m.symbol.match(/MultiCannon/i)) { if (m.symbol.match(/MultiCannon/i)) {
@@ -434,6 +436,7 @@ export default class ModificationsMenu extends TranslatedComponent {
bprintSearchName = 'MC_Overcharged'; bprintSearchName = 'MC_Overcharged';
} }
} }
}
// TODO: Fix this to actually find the correct blueprint. // TODO: Fix this to actually find the correct blueprint.
if (!m.blueprint || !m.blueprint.name || !m.blueprint.fdname || !Modifications.modules[m.grp].blueprints || !Modifications.modules[m.grp].blueprints[bprintSearchName]) { if (!m.blueprint || !m.blueprint.name || !m.blueprint.fdname || !Modifications.modules[m.grp].blueprints || !Modifications.modules[m.grp].blueprints[bprintSearchName]) {
this.props.ship.clearModuleBlueprint(m); this.props.ship.clearModuleBlueprint(m);