From 439b615b1bbfa68b055712baae3c80de898243fd Mon Sep 17 00:00:00 2001 From: felixlinker Date: Sun, 19 May 2019 00:41:12 +0200 Subject: [PATCH] Revert "Don't allow more than four experimental weapons at once" This reverts commit ac2e2e4d69a6ecbf2487b50a8663d123ac33f2d2. --- src/app/components/AvailableModulesMenu.jsx | 12 ++++-------- src/app/components/Slot.jsx | 15 --------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/src/app/components/AvailableModulesMenu.jsx b/src/app/components/AvailableModulesMenu.jsx index 6b8faed6..3ead03d2 100644 --- a/src/app/components/AvailableModulesMenu.jsx +++ b/src/app/components/AvailableModulesMenu.jsx @@ -128,7 +128,6 @@ export default class AvailableModulesMenu extends TranslatedComponent { m: PropTypes.object, shipMass: PropTypes.number, warning: PropTypes.func, - disable: PropTypes.func, firstSlotId: PropTypes.string, lastSlotId: PropTypes.string, activeSlotId: PropTypes.string, @@ -160,7 +159,7 @@ export default class AvailableModulesMenu extends TranslatedComponent { */ _initState(props, context) { let translate = context.language.translate; - let { m, warning, disable, shipMass, onSelect, modules, firstSlotId, lastSlotId } = props; + let { m, warning, shipMass, onSelect, modules, firstSlotId, lastSlotId } = props; let list, currentGroup; let buildGroup = this._buildGroup.bind( @@ -168,7 +167,6 @@ export default class AvailableModulesMenu extends TranslatedComponent { translate, m, warning, - disable, shipMass - (m && m.mass ? m.mass : 0), (m, event) => { this._hideDiff(event); @@ -260,7 +258,6 @@ export default class AvailableModulesMenu extends TranslatedComponent { * @param {Function} translate Translate function * @param {Object} mountedModule Mounted Module * @param {Function} warningFunc Warning function - * @param {Function} disableFunc Function when selection should be disabled * @param {number} mass Mass * @param {function} onSelect Select/Mount callback * @param {string} grp Group name @@ -269,7 +266,7 @@ export default class AvailableModulesMenu extends TranslatedComponent { * @param {string} lastSlotId id of last slot item * @return {React.Component} Available Module Group contents */ - _buildGroup(translate, mountedModule, warningFunc, disableFunc, mass, onSelect, grp, modules, firstSlotId, lastSlotId) { + _buildGroup(translate, mountedModule, warningFunc, mass, onSelect, grp, modules, firstSlotId, lastSlotId) { let prevClass = null, prevRating = null, prevName; let elems = []; @@ -287,7 +284,6 @@ export default class AvailableModulesMenu extends TranslatedComponent { let m = sortedModules[i]; let mount = null; let disabled = false; - let softDisabled = disableFunc && disableFunc(m); prevName = m.name; if (ModuleUtils.isShieldGenerator(m.grp)) { // Shield generators care about maximum hull mass @@ -298,7 +294,7 @@ export default class AvailableModulesMenu extends TranslatedComponent { } let active = mountedModule && mountedModule.id === m.id; let classes = cn(m.name ? 'lc' : 'c', { - warning: !disabled && (softDisabled || (warningFunc && warningFunc(m))), + warning: !disabled && warningFunc && warningFunc(m), active, disabled }); @@ -320,7 +316,7 @@ export default class AvailableModulesMenu extends TranslatedComponent { this.lastSlotId = sortedModules[i].id; let showDiff = this._showDiff.bind(this, mountedModule, m); - let select = softDisabled ? () => {} : onSelect.bind(null, m); + let select = onSelect.bind(null, m); eventHandlers = { onMouseEnter: this._over.bind(this, showDiff), diff --git a/src/app/components/Slot.jsx b/src/app/components/Slot.jsx index d083449e..8bd080ec 100644 --- a/src/app/components/Slot.jsx +++ b/src/app/components/Slot.jsx @@ -7,20 +7,6 @@ import ModificationsMenu from './ModificationsMenu'; import { diffDetails } from '../utils/SlotFunctions'; import { wrapCtxMenu } from '../utils/UtilityFunctions'; -/** - * Returns a function that checks that a given module does not exceed the limit - * of experimental modules. - * @param {Ship} ship Ship to check experimentals for - * @return {Function} Checker function that returns true if the number of - * experimentals is exceeded - */ -function experimentalTracker(ship) { - return (m) => { - return m.experimental && - 4 <= ship.hardpoints.reduce((r, o) => o.m && o.m.experimental ? r + 1 : r, 0); - }; -} - /** * Abstract Slot */ @@ -147,7 +133,6 @@ export default class Slot extends TranslatedComponent { warning={warning} diffDetails={diffDetails.bind(ship, this.context.language)} slotDiv = {this.slotDiv} - disable={experimentalTracker(ship)} />; } }