@@ -140,8 +140,8 @@ export default class ShipSummaryTable extends TranslatedComponent {
{int(ship.shieldThermRes * 100) + '%'}
{int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.absolute.total : 0)}
{int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.explosive.total : 0)}
- {int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.kinetic.total : 0 )}
- {int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.thermal.total : 0 )}
+ {int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.kinetic.total : 0)}
+ {int(sgMetrics && sgMetrics.generator ? sgMetrics.total / sgMetrics.thermal.total : 0)}
{sgMetrics && sgMetrics.recover ? formats.time(sgMetrics.recover) : 0}
{sgMetrics && sgMetrics.recharge ? formats.time(sgMetrics.recharge) : 0}
diff --git a/src/app/components/Slider.jsx b/src/app/components/Slider.jsx
index a1efbf94..bde1c2d0 100644
--- a/src/app/components/Slider.jsx
+++ b/src/app/components/Slider.jsx
@@ -1,361 +1,353 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const MARGIN_LR = 8; // Left/ Right margin
-
-/**
- * Horizontal Slider
- */
-export default class Slider extends React.Component {
-
- static defaultProps = {
- axis: false,
- min: 0,
- max: 1,
- scale: 1 // SVG render scale
- };
-
- static propTypes = {
- axis: PropTypes.bool,
- axisUnit: PropTypes.string,//units (T, M, etc.)
- max: PropTypes.number,
- min: PropTypes.number,
- onChange: PropTypes.func.isRequired,// function which determins percent value
- onResize: PropTypes.func,
- percent: PropTypes.number.isRequired,//value of slider
- scale: PropTypes.number
- };
-
- /**
- * Constructor
- * @param {Object} props React Component properties
- */
- constructor(props) {
- super(props);
- this._down = this._down.bind(this);
- this._move = this._move.bind(this);
- this._up = this._up.bind(this);
- this._keyup = this._keyup.bind(this);
- this._keydown = this._keydown.bind(this);
- this._touchstart = this._touchstart.bind(this);
- this._touchend = this._touchend.bind(this);
-
- this._updatePercent = this._updatePercent.bind(this);
- this._updateDimensions = this._updateDimensions.bind(this);
-
- this.state = { width: 0 };
- }
-
- /**
- * On Mouse/Touch down handler
- * @param {SyntheticEvent} event Event
- */
- _down(event) {
-
- let rect = event.currentTarget.getBoundingClientRect();
- this.left = rect.left;
- this.width = rect.width;
- this._move(event);
- this.touchStartTimer = setTimeout(() => this.sliderInputBox._setDisplay('block'), 1500);
- }
-
- /**
- * Update the slider percentage on move
- * @param {SyntheticEvent} event Event
- */
- _move(event) {
- if(this.width !== null && this.left != null) {
- let clientX = event.touches ? event.touches[0].clientX : event.clientX;
- event.preventDefault();
- this._updatePercent(clientX - this.left, this.width);
- }
- }
-
- /**
- * On Mouse/Touch up handler
- * @param {Event} event DOM Event
- */
- _up(event) {
- this.sliderInputBox.sliderVal.focus();
- clearTimeout(this.touchStartTimer);
- event.preventDefault();
- this.left = null;
- this.width = null;
- }
-
-
- /**
- * Key up handler for keyboard.
- * display the number field then set focus to it
- * when "Enter" key is pressed
- * @param {Event} event Keyboard event
- */
- _keyup(event) {
- switch (event.key) {
- case 'Enter':
- event.preventDefault();
- this.sliderInputBox._setDisplay('block');
- //this.enterTimer = setTimeout(() => this.sliderInputBox.sliderVal.focus(), 10);
- return;
- default:
- return;
- }
-
- }
- /**
- * Key down handler
- * increment slider position by +/- 1 when right/left arrow key is pressed or held
- * @param {Event} event
- */
- _keydown(event) {
-
- switch (event.key) {
- case 'ArrowRight':
- var newVal = this.props.percent*this.props.max + 1;
- if (newVal <= this.props.max) this.props.onChange(newVal/this.props.max);
- return;
- case 'ArrowLeft':
- var newVal = this.props.percent*this.props.max - 1;
- if (newVal >= 0) this.props.onChange(newVal/this.props.max);
- return;
- default:
- return;
- }
- }
-
- /**
- * Touch start handler
- * @param {Event} event DOM Event
- *
- */
- _touchstart(event) {
- this.touchStartTimer = setTimeout(() => this.sliderInputBox._setDisplay('block'), 1500);
- }
-
- _touchend(event) {
- this.sliderInputBox.sliderVal.focus();
- clearTimeout(this.touchStartTimer);
- }
-
- /**
- * Determine if the user is still dragging
- * @param {SyntheticEvent} event Event
- */
- _enter(event) {
- if(event.buttons !== 1) {
- this.left = null;
- this.width = null;
- }
- }
-
- /**
- * Update the slider percentage
- * @param {number} pos Slider drag position
- * @param {number} width Slider width
- * @param {Event} event DOM Event
- */
- _updatePercent(pos, width) {
- this.props.onChange(Math.min(Math.max(pos / width, 0), 1));
- }
-
- /**
- * Update dimenions from rendered DOM
- */
- _updateDimensions() {
- this.setState({
- outerWidth: this.node.getBoundingClientRect().width
- });
- }
-
- /**
- * Add listeners when about to mount
- */
- componentWillMount() {
- if (this.props.onResize) {
- this.resizeListener = this.props.onResize(this._updateDimensions);
- }
- }
-
- /**
- * Trigger DOM updates on mount
- */
- componentDidMount() {
- this._updateDimensions();
-
- }
-
- /**
- * Remove listeners on unmount
- */
- componentWillUnmount() {
- if (this.resizeListener) {
- this.resizeListener.remove();
- }
- }
-
- /**
- * Render the slider
- * @return {React.Component} The slider
- */
- render() {
- let outerWidth = this.state.outerWidth;
- let { axis, axisUnit, min, max, scale } = this.props;
-
- let style = {
- width: '100%',
- height: axis ? '2.5em' : '1.5em',
- boxSizing: 'border-box'
- };
-
- if (!outerWidth) {
- return this.node = node} />;
- }
-
- let margin = MARGIN_LR * scale;
- let width = outerWidth - (margin * 2);
- let pctPos = width * this.props.percent;
-
- return this.node = node} tabIndex="0">
-
- {min + axisUnit}
- {(min + max / 2) + axisUnit}
- {max + axisUnit}
- }
-
- this.sliderInputBox = tb}
- onChange={this.props.onChange}
- percent={this.props.percent}
- axisUnit={this.props.axisUnit}
- scale={this.props.scale}
- max={this.props.max}
-
- />
-
;
- }
-
-}
-/**
- * New component to add keyboard support for sliders - works on all devices (desktop, iOS, Android)
- **/
- class TextInputBox extends React.Component {
- static propTypes = {
- axisUnit: PropTypes.string,//units (T, M, etc.)
- max: PropTypes.number,
- onChange: PropTypes.func.isRequired,// function which determins percent value
- percent: PropTypes.number.isRequired,//value of slider
- scale: PropTypes.number
- };
- constructor(props) {
- super(props);
- this._handleFocus = this._handleFocus.bind(this);
- this._handleBlur = this._handleBlur.bind(this);
- this._handleChange = this._handleChange.bind(this);
- //this._keydown = this._keydown.bind(this);
- this._keyup = this._keyup.bind(this);
- this.state = this._getInitialState();
- this.percent = this.props.percent;
- this.max = this.props.max;
- this.state.inputValue = this.percent * this.max;
- }
-
- componentWillReceiveProps(nextProps, nextState) {
- var nextValue = nextProps.percent * nextProps.max;
- // See https://stackoverflow.com/questions/32414308/updating-state-on-props-change-in-react-form
- if (nextValue !== this.state.inputValue && nextValue <= nextProps.max) {
- this.setState({ inputValue: nextValue });
- }
- }
- componentDidUpdate(prevProps, prevState) {
-
- if (prevState.divStyle.display == 'none' && this.state.divStyle.display == 'block') {
- this.enterTimer = setTimeout(() => this.sliderVal.focus(), 10);
- }
-
- if (prevProps.max !== this.props.max && this.state.inputValue > this.props.max) {
- // they chose a different module
- this.setState({ inputValue: this.props.max });
- }
-
- if (this.state.inputValue != prevState.inputValue && prevProps.max == this.props.max) {
- this.props.onChange(this.state.inputValue/this.props.max);
- }
-
- }
-
- _getInitialState() {
- return {
- divStyle: {display:'none'},
- inputStyle: {width:'4em'},
- labelStyle: {marginLeft: '.1em'},
- maxLength:5,
- size:5,
- min:0,
- tabIndex:-1,
- type:'number',
- readOnly: true
- }
- }
-
- _setDisplay(val) {
- this.setState({
- divStyle: {display:val}
- });
- }
-
- _handleFocus() {
- this.setState({
- inputValue:this._getValue()
- });
- }
-
- _handleBlur() {
- this._setDisplay('none');
- if (this.state.inputValue !== '') {
- this.props.onChange(this.state.inputValue/this.props.max);
- } else {
- this.state.inputValue = this.props.percent * this.props.max;
- }
-
- }
-
- _getValue() {
- return this.state.inputValue;
- }
-
- _handleChange(event) {
- if (event.target.value < 0) {
- this.setState({inputValue: 0});
- } else if (event.target.value <= this.props.max) {
- this.setState({inputValue: event.target.value});
- } else {
- this.setState({inputValue: this.props.max});
- }
- }
-
- /**
- * Key up handler for input field.
- * If user hits Enter key, blur/close the input field
- * @param {Event} event Keyboard event
- */
- _keyup(event) {
- switch (event.key) {
- case 'Enter':
- this.sliderVal.blur();
- return;
- default:
- return;
- }
-
- }
-
- render() {
- let { axisUnit, onChange, percent, scale } = this.props;
- return {this.props.axisUnit}
;
- }
- }
-
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const MARGIN_LR = 8; // Left/ Right margin
+
+/**
+ * Horizontal Slider
+ */
+export default class Slider extends React.Component {
+
+ static defaultProps = {
+ axis: false,
+ min: 0,
+ max: 1,
+ scale: 1 // SVG render scale
+ };
+
+ static propTypes = {
+ axis: PropTypes.bool,
+ axisUnit: PropTypes.string,// units (T, M, etc.)
+ max: PropTypes.number,
+ min: PropTypes.number,
+ onChange: PropTypes.func.isRequired,// function which determins percent value
+ onResize: PropTypes.func,
+ percent: PropTypes.number.isRequired,// value of slider
+ scale: PropTypes.number
+ };
+
+ /**
+ * Constructor
+ * @param {Object} props React Component properties
+ */
+ constructor(props) {
+ super(props);
+ this._down = this._down.bind(this);
+ this._move = this._move.bind(this);
+ this._up = this._up.bind(this);
+ this._keyup = this._keyup.bind(this);
+ this._keydown = this._keydown.bind(this);
+ this._touchstart = this._touchstart.bind(this);
+ this._touchend = this._touchend.bind(this);
+
+ this._updatePercent = this._updatePercent.bind(this);
+ this._updateDimensions = this._updateDimensions.bind(this);
+
+ this.state = { width: 0 };
+ }
+
+ /**
+ * On Mouse/Touch down handler
+ * @param {SyntheticEvent} event Event
+ */
+ _down(event) {
+ let rect = event.currentTarget.getBoundingClientRect();
+ this.left = rect.left;
+ this.width = rect.width;
+ this._move(event);
+ this.touchStartTimer = setTimeout(() => this.sliderInputBox._setDisplay('block'), 1500);
+ }
+
+ /**
+ * Update the slider percentage on move
+ * @param {SyntheticEvent} event Event
+ */
+ _move(event) {
+ if(this.width !== null && this.left != null) {
+ let clientX = event.touches ? event.touches[0].clientX : event.clientX;
+ event.preventDefault();
+ this._updatePercent(clientX - this.left, this.width);
+ }
+ }
+
+ /**
+ * On Mouse/Touch up handler
+ * @param {Event} event DOM Event
+ */
+ _up(event) {
+ this.sliderInputBox.sliderVal.focus();
+ clearTimeout(this.touchStartTimer);
+ event.preventDefault();
+ this.left = null;
+ this.width = null;
+ }
+
+
+ /**
+ * Key up handler for keyboard.
+ * display the number field then set focus to it
+ * when "Enter" key is pressed
+ * @param {Event} event Keyboard event
+ */
+ _keyup(event) {
+ switch (event.key) {
+ case 'Enter':
+ event.preventDefault();
+ this.sliderInputBox._setDisplay('block');
+ // this.enterTimer = setTimeout(() => this.sliderInputBox.sliderVal.focus(), 10);
+ return;
+ default:
+ return;
+ }
+ }
+ /**
+ * Key down handler
+ * increment slider position by +/- 1 when right/left arrow key is pressed or held
+ * @param {Event} event
+ */
+ _keydown(event) {
+ switch (event.key) {
+ case 'ArrowRight':
+ let newVal = this.props.percent * this.props.max + 1;
+ if (newVal <= this.props.max) this.props.onChange(newVal / this.props.max);
+ return;
+ case 'ArrowLeft':
+ let newVal = this.props.percent * this.props.max - 1;
+ if (newVal >= 0) this.props.onChange(newVal / this.props.max);
+ return;
+ default:
+ return;
+ }
+ }
+
+ /**
+ * Touch start handler
+ * @param {Event} event DOM Event
+ *
+ */
+ _touchstart(event) {
+ this.touchStartTimer = setTimeout(() => this.sliderInputBox._setDisplay('block'), 1500);
+ }
+
+ _touchend(event) {
+ this.sliderInputBox.sliderVal.focus();
+ clearTimeout(this.touchStartTimer);
+ }
+
+ /**
+ * Determine if the user is still dragging
+ * @param {SyntheticEvent} event Event
+ */
+ _enter(event) {
+ if(event.buttons !== 1) {
+ this.left = null;
+ this.width = null;
+ }
+ }
+
+ /**
+ * Update the slider percentage
+ * @param {number} pos Slider drag position
+ * @param {number} width Slider width
+ * @param {Event} event DOM Event
+ */
+ _updatePercent(pos, width) {
+ this.props.onChange(Math.min(Math.max(pos / width, 0), 1));
+ }
+
+ /**
+ * Update dimenions from rendered DOM
+ */
+ _updateDimensions() {
+ this.setState({
+ outerWidth: this.node.getBoundingClientRect().width
+ });
+ }
+
+ /**
+ * Add listeners when about to mount
+ */
+ componentWillMount() {
+ if (this.props.onResize) {
+ this.resizeListener = this.props.onResize(this._updateDimensions);
+ }
+ }
+
+ /**
+ * Trigger DOM updates on mount
+ */
+ componentDidMount() {
+ this._updateDimensions();
+ }
+
+ /**
+ * Remove listeners on unmount
+ */
+ componentWillUnmount() {
+ if (this.resizeListener) {
+ this.resizeListener.remove();
+ }
+ }
+
+ /**
+ * Render the slider
+ * @return {React.Component} The slider
+ */
+ render() {
+ let outerWidth = this.state.outerWidth;
+ let { axis, axisUnit, min, max, scale } = this.props;
+
+ let style = {
+ width: '100%',
+ height: axis ? '2.5em' : '1.5em',
+ boxSizing: 'border-box'
+ };
+
+ if (!outerWidth) {
+ return this.node = node} />;
+ }
+
+ let margin = MARGIN_LR * scale;
+ let width = outerWidth - (margin * 2);
+ let pctPos = width * this.props.percent;
+
+ return this.node = node} tabIndex="0">
+
+ {min + axisUnit}
+ {(min + max / 2) + axisUnit}
+ {max + axisUnit}
+ }
+
+ this.sliderInputBox = tb}
+ onChange={this.props.onChange}
+ percent={this.props.percent}
+ axisUnit={this.props.axisUnit}
+ scale={this.props.scale}
+ max={this.props.max}
+
+ />
+
;
+ }
+
+}
+/**
+ * New component to add keyboard support for sliders - works on all devices (desktop, iOS, Android)
+ **/
+class TextInputBox extends React.Component {
+ static propTypes = {
+ axisUnit: PropTypes.string,// units (T, M, etc.)
+ max: PropTypes.number,
+ onChange: PropTypes.func.isRequired,// function which determins percent value
+ percent: PropTypes.number.isRequired,// value of slider
+ scale: PropTypes.number
+ };
+ constructor(props) {
+ super(props);
+ this._handleFocus = this._handleFocus.bind(this);
+ this._handleBlur = this._handleBlur.bind(this);
+ this._handleChange = this._handleChange.bind(this);
+ // this._keydown = this._keydown.bind(this);
+ this._keyup = this._keyup.bind(this);
+ this.state = this._getInitialState();
+ this.percent = this.props.percent;
+ this.max = this.props.max;
+ this.state.inputValue = this.percent * this.max;
+ }
+
+ componentWillReceiveProps(nextProps, nextState) {
+ let nextValue = nextProps.percent * nextProps.max;
+ // See https://stackoverflow.com/questions/32414308/updating-state-on-props-change-in-react-form
+ if (nextValue !== this.state.inputValue && nextValue <= nextProps.max) {
+ this.setState({ inputValue: nextValue });
+ }
+ }
+ componentDidUpdate(prevProps, prevState) {
+ if (prevState.divStyle.display == 'none' && this.state.divStyle.display == 'block') {
+ this.enterTimer = setTimeout(() => this.sliderVal.focus(), 10);
+ }
+
+ if (prevProps.max !== this.props.max && this.state.inputValue > this.props.max) {
+ // they chose a different module
+ this.setState({ inputValue: this.props.max });
+ }
+
+ if (this.state.inputValue != prevState.inputValue && prevProps.max == this.props.max) {
+ this.props.onChange(this.state.inputValue / this.props.max);
+ }
+ }
+
+ _getInitialState() {
+ return {
+ divStyle: { display:'none' },
+ inputStyle: { width:'4em' },
+ labelStyle: { marginLeft: '.1em' },
+ maxLength:5,
+ size:5,
+ min:0,
+ tabIndex:-1,
+ type:'number',
+ readOnly: true
+ };
+ }
+
+ _setDisplay(val) {
+ this.setState({
+ divStyle: { display:val }
+ });
+ }
+
+ _handleFocus() {
+ this.setState({
+ inputValue:this._getValue()
+ });
+ }
+
+ _handleBlur() {
+ this._setDisplay('none');
+ if (this.state.inputValue !== '') {
+ this.props.onChange(this.state.inputValue / this.props.max);
+ } else {
+ this.state.inputValue = this.props.percent * this.props.max;
+ }
+ }
+
+ _getValue() {
+ return this.state.inputValue;
+ }
+
+ _handleChange(event) {
+ if (event.target.value < 0) {
+ this.setState({ inputValue: 0 });
+ } else if (event.target.value <= this.props.max) {
+ this.setState({ inputValue: event.target.value });
+ } else {
+ this.setState({ inputValue: this.props.max });
+ }
+ }
+
+ /**
+ * Key up handler for input field.
+ * If user hits Enter key, blur/close the input field
+ * @param {Event} event Keyboard event
+ */
+ _keyup(event) {
+ switch (event.key) {
+ case 'Enter':
+ this.sliderVal.blur();
+ return;
+ default:
+ return;
+ }
+ }
+
+ render() {
+ let { axisUnit, onChange, percent, scale } = this.props;
+ return {this.props.axisUnit}
;
+ }
+ }
+
diff --git a/src/app/components/Slot.jsx b/src/app/components/Slot.jsx
index c8b4c32f..7efec1ea 100644
--- a/src/app/components/Slot.jsx
+++ b/src/app/components/Slot.jsx
@@ -81,17 +81,17 @@ export default class Slot extends TranslatedComponent {
* we do more or less the same thing
* in every section when Enter key is pressed
* on a focusable item
- *
+ *
*/
_keyDown(event) {
if (event.key == 'Enter') {
- if(event.target.className == 'r') {
- console.log("Slot: Enter key pressed on mod icon");
- this._toggleModifications();
- } else {
- console.log("Slot: Enter key pressed on: %O", event.target);
- }
- this.props.onOpen(event);
+ if(event.target.className == 'r') {
+ console.log('Slot: Enter key pressed on mod icon');
+ this._toggleModifications();
+ } else {
+ console.log('Slot: Enter key pressed on: %O', event.target);
+ }
+ this.props.onOpen(event);
}
}
/**
@@ -154,7 +154,7 @@ export default class Slot extends TranslatedComponent {
);
}
-
+
/**
* Toggle the modifications flag when selecting the modifications icon
*/
diff --git a/src/app/components/StandardSlot.jsx b/src/app/components/StandardSlot.jsx
index cfca8530..18b12137 100644
--- a/src/app/components/StandardSlot.jsx
+++ b/src/app/components/StandardSlot.jsx
@@ -40,12 +40,12 @@ export default class StandardSlot extends TranslatedComponent {
this.slotDiv = null;
}
- _keyDown(event) {
+ _keyDown(event) {
if (event.key == 'Enter') {
- if(event.target.className == 'r') {
- this._toggleModifications();
- }
- this.props.onOpen(event);
+ if(event.target.className == 'r') {
+ this._toggleModifications();
+ }
+ this.props.onOpen(event);
}
}
@@ -151,7 +151,6 @@ export default class StandardSlot extends TranslatedComponent {
* Toggle the modifications flag when selecting the modifications icon
*/
_toggleModifications() {
-
this._modificationsSelected = !this._modificationsSelected;
}
}
diff --git a/src/app/pages/OutfittingPage.jsx b/src/app/pages/OutfittingPage.jsx
index 5b6d5a61..ac346a8f 100644
--- a/src/app/pages/OutfittingPage.jsx
+++ b/src/app/pages/OutfittingPage.jsx
@@ -554,17 +554,17 @@ export default class OutfittingPage extends Page {
const shipSummaryMarker = `${ship.name}${_sStr}${_iStr}${_hStr}${_pStr}${_mStr}${ship.ladenMass}${cargo}${fuel}`;
const requirements = Ships[ship.id].requirements;
- var requirementElements = [];
+ let requirementElements = [];
function renderRequirement(className, textKey, tooltipTextKey) {
- requirementElements.push();
+ requirementElements.push();
}
if (requirements) {
requirements.federationRank && renderRequirement('federation', 'federation rank ' + requirements.federationRank, 'federation rank required');
requirements.empireRank && renderRequirement('empire', 'empire rank ' + requirements.empireRank, 'empire rank required');
requirements.horizons && renderRequirement('horizons', 'horizons', 'horizons required');
- requirements.horizonsEarlyAdoption && renderRequirement('horizons', 'horizons early adoption', 'horizons early adoption required');
+ requirements.horizonsEarlyAdoption && renderRequirement('horizons', 'horizons early adoption', 'horizons early adoption required');
}
return (
@@ -602,7 +602,7 @@ export default class OutfittingPage extends Page {
{/* Main tables */}
-
- {translate(feature, grp)}
-
- {current}{symbol}
-
-
- );
- }
+ effects.push(
+
+ {translate(feature, grp)}
+
+ {current}{symbol}
+
+
+ );
+ }
}
-
}
}
@@ -289,7 +288,7 @@ export function isValueBeneficial(feature, value) {
*/
export function getBlueprint(name, module) {
// Start with a copy of the blueprint
- const findMod = val => Object.keys(Modifications.blueprints).find(elem => elem.toString().toLowerCase().search(val.toString().toLowerCase().replace(/(OutfittingFieldType_|persecond)/igm, '')) >= 0)
+ const findMod = val => Object.keys(Modifications.blueprints).find(elem => elem.toString().toLowerCase().search(val.toString().toLowerCase().replace(/(OutfittingFieldType_|persecond)/igm, '')) >= 0);
const found = Modifications.blueprints[findMod(name)];
if (!found || !found.fdname) {
return {};
@@ -382,36 +381,35 @@ export function getPercent(m) {
let result = null;
const features = m.blueprint.grades[m.blueprint.grade].features;
for (const featureName in features) {
-
- if (features[featureName][0] === features[featureName][1]) {
- continue;
- }
-
- let value = _getValue(m, featureName);
- let mult;
+ if (features[featureName][0] === features[featureName][1]) {
+ continue;
+ }
+
+ let value = _getValue(m, featureName);
+ let mult;
if (Modifications.modifications[featureName].higherbetter) {
// Higher is better, but is this making it better or worse?
if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
- mult = Math.round((value - features[featureName][1]) / (features[featureName][0] - features[featureName][1]) * 100);
+ mult = Math.round((value - features[featureName][1]) / (features[featureName][0] - features[featureName][1]) * 100);
} else {
- mult = Math.round((value - features[featureName][0]) / (features[featureName][1] - features[featureName][0]) * 100);
+ mult = Math.round((value - features[featureName][0]) / (features[featureName][1] - features[featureName][0]) * 100);
}
} else {
// Higher is worse, but is this making it better or worse?
if (features[featureName][0] < 0 || (features[featureName][0] === 0 && features[featureName][1] < 0)) {
- mult = Math.round((value - features[featureName][0]) / (features[featureName][1] - features[featureName][0]) * 100);
+ mult = Math.round((value - features[featureName][0]) / (features[featureName][1] - features[featureName][0]) * 100);
} else {
- mult = Math.round((value - features[featureName][1]) / (features[featureName][0] - features[featureName][1]) * 100);
+ mult = Math.round((value - features[featureName][1]) / (features[featureName][0] - features[featureName][1]) * 100);
}
}
-
- if (result && result != mult) {
- return null;
- } else if (result != mult) {
- result = mult;
- }
+
+ if (result && result != mult) {
+ return null;
+ } else if (result != mult) {
+ result = mult;
+ }
}
-
+
return result;
}
diff --git a/src/app/utils/CompanionApiUtils.js b/src/app/utils/CompanionApiUtils.js
index 4f6d86e0..1755bb27 100644
--- a/src/app/utils/CompanionApiUtils.js
+++ b/src/app/utils/CompanionApiUtils.js
@@ -318,7 +318,7 @@ function _addModifications(module, modifiers, blueprint, grade, specialModificat
if (!modifiers) return;
let special;
if (specialModifications) {
- special = Modifications.specials[Object.keys(specialModifications)[0]]
+ special = Modifications.specials[Object.keys(specialModifications)[0]];
}
for (const i in modifiers) {
// Some special modifications
@@ -345,7 +345,7 @@ function _addModifications(module, modifiers, blueprint, grade, specialModificat
let value;
if (i === 'OutfittingFieldType_DefenceModifierShieldMultiplier') {
value = modifiers[i].value - 1;
- } else if (i === 'OutfittingFieldType_DefenceModifierHealthMultiplier' && blueprint.startsWith('Armour_')) {
+ } else if (i === 'OutfittingFieldType_DefenceModifierHealthMultiplier' && blueprint.startsWith('Armour_')) {
value = (modifiers[i].value - module.hullboost) / module.hullboost;
} else if (i === 'OutfittingFieldType_DefenceModifierHealthMultiplier') {
value = modifiers[i].value / module.hullboost;
diff --git a/src/app/utils/JournalUtils.js b/src/app/utils/JournalUtils.js
index 08b39a96..89381b03 100644
--- a/src/app/utils/JournalUtils.js
+++ b/src/app/utils/JournalUtils.js
@@ -1,26 +1,26 @@
-import Ship from '../shipyard/Ship'
-import { HARDPOINT_NUM_TO_CLASS, shipModelFromJson } from './CompanionApiUtils'
-import { Ships } from 'coriolis-data/dist'
-import Module from '../shipyard/Module'
-import { Modules } from 'coriolis-data/dist'
-import { Modifications } from 'coriolis-data/dist'
-import { getBlueprint } from './BlueprintFunctions'
+import Ship from '../shipyard/Ship';
+import { HARDPOINT_NUM_TO_CLASS, shipModelFromJson } from './CompanionApiUtils';
+import { Ships } from 'coriolis-data/dist';
+import Module from '../shipyard/Module';
+import { Modules } from 'coriolis-data/dist';
+import { Modifications } from 'coriolis-data/dist';
+import { getBlueprint } from './BlueprintFunctions';
/**
* Obtain a module given its FD Name
* @param {string} fdname the FD Name of the module
* @return {Module} the module
*/
-function _moduleFromFdName (fdname) {
- if (!fdname) return null
- fdname = fdname.toLowerCase()
+function _moduleFromFdName(fdname) {
+ if (!fdname) return null;
+ fdname = fdname.toLowerCase();
// Check standard modules
for (const grp in Modules.standard) {
if (Modules.standard.hasOwnProperty(grp)) {
for (const i in Modules.standard[grp]) {
if (Modules.standard[grp][i].symbol && Modules.standard[grp][i].symbol.toLowerCase() === fdname) {
// Found it
- return new Module({template: Modules.standard[grp][i]})
+ return new Module({ template: Modules.standard[grp][i] });
}
}
}
@@ -32,7 +32,7 @@ function _moduleFromFdName (fdname) {
for (const i in Modules.hardpoints[grp]) {
if (Modules.hardpoints[grp][i].symbol && Modules.hardpoints[grp][i].symbol.toLowerCase() === fdname) {
// Found it
- return new Module({template: Modules.hardpoints[grp][i]})
+ return new Module({ template: Modules.hardpoints[grp][i] });
}
}
}
@@ -44,14 +44,14 @@ function _moduleFromFdName (fdname) {
for (const i in Modules.internal[grp]) {
if (Modules.internal[grp][i].symbol && Modules.internal[grp][i].symbol.toLowerCase() === fdname) {
// Found it
- return new Module({template: Modules.internal[grp][i]})
+ return new Module({ template: Modules.internal[grp][i] });
}
}
}
}
// Not found
- return null
+ return null;
}
/**
@@ -59,16 +59,16 @@ function _moduleFromFdName (fdname) {
* @param {object} json the Loadout event JSON
* @return {Ship} the built ship
*/
-export function shipFromLoadoutJSON (json) {
+export function shipFromLoadoutJSON(json) {
// Start off building a basic ship
- const shipModel = shipModelFromJson(json)
+ const shipModel = shipModelFromJson(json);
if (!shipModel) {
- throw 'No such ship found: "' + json.Ship + '"'
+ throw 'No such ship found: "' + json.Ship + '"';
}
- const shipTemplate = Ships[shipModel]
+ const shipTemplate = Ships[shipModel];
- let ship = new Ship(shipModel, shipTemplate.properties, shipTemplate.slots)
- ship.buildWith(null)
+ let ship = new Ship(shipModel, shipTemplate.properties, shipTemplate.slots);
+ ship.buildWith(null);
// Initial Ship building, don't do engineering yet.
let opts = [];
@@ -76,135 +76,135 @@ export function shipFromLoadoutJSON (json) {
switch (module.Slot.toLowerCase()) {
// Cargo Hatch.
case 'cargohatch':
- ship.cargoHatch.enabled = module.On
- ship.cargoHatch.priority = module.Priority
- break
+ ship.cargoHatch.enabled = module.On;
+ ship.cargoHatch.priority = module.Priority;
+ break;
// Add the bulkheads
case 'armour':
if (module.Item.toLowerCase().endsWith('_armour_grade1')) {
- ship.useBulkhead(0, true)
+ ship.useBulkhead(0, true);
} else if (module.Item.toLowerCase().endsWith('_armour_grade2')) {
- ship.useBulkhead(1, true)
+ ship.useBulkhead(1, true);
} else if (module.Item.toLowerCase().endsWith('_armour_grade3')) {
- ship.useBulkhead(2, true)
+ ship.useBulkhead(2, true);
} else if (module.Item.toLowerCase().endsWith('_armour_mirrored')) {
- ship.useBulkhead(3, true)
+ ship.useBulkhead(3, true);
} else if (module.Item.toLowerCase().endsWith('_armour_reactive')) {
- ship.useBulkhead(4, true)
+ ship.useBulkhead(4, true);
} else {
- throw 'Unknown bulkheads "' + module.Item + '"'
+ throw 'Unknown bulkheads "' + module.Item + '"';
}
- ship.bulkheads.enabled = true
- if (module.Engineering) _addModifications(ship.bulkheads.m, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect)
- break
+ ship.bulkheads.enabled = true;
+ if (module.Engineering) _addModifications(ship.bulkheads.m, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+ break;
case 'powerplant':
- const powerplant = _moduleFromFdName(module.Item)
- ship.use(ship.standard[0], powerplant, true)
- ship.standard[0].enabled = module.On
- ship.standard[0].priority = module.Priority
- if (module.Engineering) _addModifications(powerplant, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect)
- break
+ const powerplant = _moduleFromFdName(module.Item);
+ ship.use(ship.standard[0], powerplant, true);
+ ship.standard[0].enabled = module.On;
+ ship.standard[0].priority = module.Priority;
+ if (module.Engineering) _addModifications(powerplant, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+ break;
case 'mainengines':
- const thrusters = _moduleFromFdName(module.Item)
- ship.use(ship.standard[1], thrusters, true)
- ship.standard[1].enabled = module.On
- ship.standard[1].priority = module.Priority
- if (module.Engineering) _addModifications(thrusters, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect)
- break
+ const thrusters = _moduleFromFdName(module.Item);
+ ship.use(ship.standard[1], thrusters, true);
+ ship.standard[1].enabled = module.On;
+ ship.standard[1].priority = module.Priority;
+ if (module.Engineering) _addModifications(thrusters, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+ break;
case 'frameshiftdrive':
- const frameshiftdrive = _moduleFromFdName(module.Item)
- ship.use(ship.standard[2], frameshiftdrive, true)
- ship.standard[2].enabled = module.On
- ship.standard[2].priority = module.Priority
- if (module.Engineering) _addModifications(frameshiftdrive, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect)
- break
+ const frameshiftdrive = _moduleFromFdName(module.Item);
+ ship.use(ship.standard[2], frameshiftdrive, true);
+ ship.standard[2].enabled = module.On;
+ ship.standard[2].priority = module.Priority;
+ if (module.Engineering) _addModifications(frameshiftdrive, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+ break;
case 'lifesupport':
- const lifesupport = _moduleFromFdName(module.Item)
- ship.use(ship.standard[3], lifesupport, true)
- ship.standard[3].enabled = module.On === true
- ship.standard[3].priority = module.Priority
- if (module.Engineering) _addModifications(lifesupport, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect)
- break
+ const lifesupport = _moduleFromFdName(module.Item);
+ ship.use(ship.standard[3], lifesupport, true);
+ ship.standard[3].enabled = module.On === true;
+ ship.standard[3].priority = module.Priority;
+ if (module.Engineering) _addModifications(lifesupport, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+ break;
case 'powerdistributor':
- const powerdistributor = _moduleFromFdName(module.Item)
- ship.use(ship.standard[4], powerdistributor, true)
- ship.standard[4].enabled = module.On
- ship.standard[4].priority = module.Priority
- if (module.Engineering) _addModifications(powerdistributor, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect)
- break
+ const powerdistributor = _moduleFromFdName(module.Item);
+ ship.use(ship.standard[4], powerdistributor, true);
+ ship.standard[4].enabled = module.On;
+ ship.standard[4].priority = module.Priority;
+ if (module.Engineering) _addModifications(powerdistributor, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+ break;
case 'radar':
- const sensors = _moduleFromFdName(module.Item)
- ship.use(ship.standard[5], sensors, true)
- ship.standard[5].enabled = module.On
- ship.standard[5].priority = module.Priority
- if (module.Engineering) _addModifications(sensors, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect)
- break
+ const sensors = _moduleFromFdName(module.Item);
+ ship.use(ship.standard[5], sensors, true);
+ ship.standard[5].enabled = module.On;
+ ship.standard[5].priority = module.Priority;
+ if (module.Engineering) _addModifications(sensors, module.Engineering.Modifiers, module.Engineering.BlueprintName, module.Engineering.Level, module.Engineering.ExperimentalEffect);
+ break;
case 'fueltank':
- const fueltank = _moduleFromFdName(module.Item)
- ship.use(ship.standard[6], fueltank, true)
- ship.standard[6].enabled = true
- ship.standard[6].priority = 0
- break
+ const fueltank = _moduleFromFdName(module.Item);
+ ship.use(ship.standard[6], fueltank, true);
+ ship.standard[6].enabled = true;
+ ship.standard[6].priority = 0;
+ break;
default:
}
for (const module of json.Modules) {
if (module.Slot.toLowerCase().search(/hardpoint/) !== -1) {
// Add hardpoints
let hardpoint;
- let hardpointClassNum = -1
- let hardpointSlotNum = -1
- let hardpointArrayNum = 0
+ let hardpointClassNum = -1;
+ let hardpointSlotNum = -1;
+ let hardpointArrayNum = 0;
for (let i in shipTemplate.slots.hardpoints) {
if (shipTemplate.slots.hardpoints[i] === hardpointClassNum) {
// Another slot of the same class
- hardpointSlotNum++
+ hardpointSlotNum++;
} else {
// The first slot of a new class
- hardpointClassNum = shipTemplate.slots.hardpoints[i]
- hardpointSlotNum = 1
+ hardpointClassNum = shipTemplate.slots.hardpoints[i];
+ hardpointSlotNum = 1;
}
// Now that we know what we're looking for, find it
- const hardpointName = HARDPOINT_NUM_TO_CLASS[hardpointClassNum] + 'Hardpoint' + hardpointSlotNum
- const hardpointSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === hardpointName.toLowerCase())
+ const hardpointName = HARDPOINT_NUM_TO_CLASS[hardpointClassNum] + 'Hardpoint' + hardpointSlotNum;
+ const hardpointSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === hardpointName.toLowerCase());
if (!hardpointSlot) {
// This can happen with old imports that don't contain new hardpoints
} else if (!hardpointSlot) {
// No module
} else {
- hardpoint = _moduleFromFdName(hardpointSlot.Item)
- ship.use(ship.hardpoints[hardpointArrayNum], hardpoint, true)
- ship.hardpoints[hardpointArrayNum].enabled = hardpointSlot.On
- ship.hardpoints[hardpointArrayNum].priority = hardpointSlot.Priority
- opts.push({coriolisMod: hardpoint, json: hardpointSlot});
+ hardpoint = _moduleFromFdName(hardpointSlot.Item);
+ ship.use(ship.hardpoints[hardpointArrayNum], hardpoint, true);
+ ship.hardpoints[hardpointArrayNum].enabled = hardpointSlot.On;
+ ship.hardpoints[hardpointArrayNum].priority = hardpointSlot.Priority;
+ opts.push({ coriolisMod: hardpoint, json: hardpointSlot });
}
- hardpointArrayNum++
+ hardpointArrayNum++;
}
}
if (module.Slot.toLowerCase().search(/slot\d/) !== -1) {
- let internalSlotNum = 1
- let militarySlotNum = 1
+ let internalSlotNum = 1;
+ let militarySlotNum = 1;
for (let i in shipTemplate.slots.internal) {
- const isMilitary = isNaN(shipTemplate.slots.internal[i]) ? shipTemplate.slots.internal[i].name = 'military' : false
+ const isMilitary = isNaN(shipTemplate.slots.internal[i]) ? shipTemplate.slots.internal[i].name = 'military' : false;
// The internal slot might be a standard or a military slot. Military slots have a different naming system
- let internalSlot = null
+ let internalSlot = null;
if (isMilitary) {
- const internalName = 'Military0' + militarySlotNum
- internalSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase())
- militarySlotNum++
+ const internalName = 'Military0' + militarySlotNum;
+ internalSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase());
+ militarySlotNum++;
} else {
// Slot numbers are not contiguous so handle skips.
while (internalSlot === null && internalSlotNum < 99) {
// Slot sizes have no relationship to the actual size, either, so check all possibilities
for (let slotsize = 0; slotsize < 9; slotsize++) {
- const internalName = 'Slot' + (internalSlotNum <= 9 ? '0' : '') + internalSlotNum + '_Size' + slotsize
+ const internalName = 'Slot' + (internalSlotNum <= 9 ? '0' : '') + internalSlotNum + '_Size' + slotsize;
if (json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase())) {
internalSlot = json.Modules.find(elem => elem.Slot.toLowerCase() === internalName.toLowerCase());
- break
+ break;
}
}
- internalSlotNum++
+ internalSlotNum++;
}
}
@@ -213,12 +213,12 @@ export function shipFromLoadoutJSON (json) {
} else if (!internalSlot) {
// No module
} else {
- const internalJson = internalSlot
- const internal = _moduleFromFdName(internalJson.Item)
- ship.use(ship.internal[i], internal, true)
- ship.internal[i].enabled = internalJson.On === true
- ship.internal[i].priority = internalJson.Priority
- opts.push({coriolisMod: internal, json: internalSlot});
+ const internalJson = internalSlot;
+ const internal = _moduleFromFdName(internalJson.Item);
+ ship.use(ship.internal[i], internal, true);
+ ship.internal[i].enabled = internalJson.On === true;
+ ship.internal[i].priority = internalJson.Priority;
+ opts.push({ coriolisMod: internal, json: internalSlot });
}
}
}
@@ -226,17 +226,17 @@ export function shipFromLoadoutJSON (json) {
}
for (const i of opts) {
- if (i.json.Engineering) _addModifications(i.coriolisMod, i.json.Engineering.Modifiers, i.json.Engineering.BlueprintName, i.json.Engineering.Level, i.json.Engineering.ExperimentalEffect)
+ if (i.json.Engineering) _addModifications(i.coriolisMod, i.json.Engineering.Modifiers, i.json.Engineering.BlueprintName, i.json.Engineering.Level, i.json.Engineering.ExperimentalEffect);
}
// We don't have any information on it so guess it's priority 5 and disabled
if (!ship.cargoHatch) {
- ship.cargoHatch.enabled = false
- ship.cargoHatch.priority = 4
+ ship.cargoHatch.enabled = false;
+ ship.cargoHatch.priority = 4;
}
- console.log(ship)
+ console.log(ship);
// Now update the ship's codes before returning it
- return ship.updatePowerPrioritesString().updatePowerEnabledString().updateModificationsString()
+ return ship.updatePowerPrioritesString().updatePowerEnabledString().updateModificationsString();
}
/**
@@ -247,18 +247,18 @@ export function shipFromLoadoutJSON (json) {
* @param {Object} grade the grade of the modification
* @param {Object} specialModifications special modification
*/
-function _addModifications (module, modifiers, blueprint, grade, specialModifications) {
- if (!modifiers) return
- let special
+function _addModifications(module, modifiers, blueprint, grade, specialModifications) {
+ if (!modifiers) return;
+ let special;
if (specialModifications) {
- special = Modifications.specials[specialModifications]
+ special = Modifications.specials[specialModifications];
}
for (const i in modifiers) {
// Some special modifications
// Look up the modifiers to find what we need to do
- const findMod = val => Object.keys(Modifications.modifierActions).find(elem => elem.toString().toLowerCase().replace(/(outfittingfieldtype_|persecond)/igm, '') === val.toString().toLowerCase().replace(/(outfittingfieldtype_|persecond)/igm, ''))
- const modifierActions = Modifications.modifierActions[findMod(modifiers[i].Label)]
- //TODO: Figure out how to scale this value.
+ const findMod = val => Object.keys(Modifications.modifierActions).find(elem => elem.toString().toLowerCase().replace(/(outfittingfieldtype_|persecond)/igm, '') === val.toString().toLowerCase().replace(/(outfittingfieldtype_|persecond)/igm, ''));
+ const modifierActions = Modifications.modifierActions[findMod(modifiers[i].Label)];
+ // TODO: Figure out how to scale this value.
if (!!modifiers[i].LessIsGood) {
}
@@ -267,26 +267,26 @@ function _addModifications (module, modifiers, blueprint, grade, specialModifica
value = modifiers[i].Value * 100;
}
if (modifiers[i].Label.search('Resistance') >= 0) {
- value = (modifiers[i].Value * 100) - (modifiers[i].OriginalValue * 100)
+ value = (modifiers[i].Value * 100) - (modifiers[i].OriginalValue * 100);
}
// Carry out the required changes
for (const action in modifierActions) {
if (isNaN(modifierActions[action])) {
- module.setModValue(action, modifierActions[action])
+ module.setModValue(action, modifierActions[action]);
} else {
- module.setModValue(action, value)
+ module.setModValue(action, value);
}
}
}
// Add the blueprint definition, grade and special
if (blueprint) {
- module.blueprint = getBlueprint(blueprint, module)
+ module.blueprint = getBlueprint(blueprint, module);
if (grade) {
- module.blueprint.grade = Number(grade)
+ module.blueprint.grade = Number(grade);
}
if (special) {
- module.blueprint.special = special
+ module.blueprint.special = special;
}
}
}