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

Revert "Don't allow more than four experimental weapons at once"

Browse Source 
This reverts commit ac2e2e4d69.
This commit is contained in:
felixlinker
2019-05-19 00:41:12 +02:00
parent a8b30594dc
commit 439b615b1b
2 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/components/AvailableModulesMenu.jsx
View File

@@ -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),

15
src/app/components/Slot.jsx
View File

@@ -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)}
/>;
}
}