;
+ }
+}
diff --git a/src/app/components/Modification.jsx b/src/app/components/Modification.jsx
index e6d2bc29..c999ff35 100644
--- a/src/app/components/Modification.jsx
+++ b/src/app/components/Modification.jsx
@@ -72,7 +72,7 @@ export default class Modification extends TranslatedComponent {
let symbol;
if (name === 'jitter') {
symbol = '°';
- } else if (name !== 'burst') {
+ } else if (name !== 'burst' && name != 'burstrof') {
symbol = '%';
}
if (symbol) {
diff --git a/src/app/components/ModificationsMenu.jsx b/src/app/components/ModificationsMenu.jsx
index 1e05deaa..3e0f558d 100644
--- a/src/app/components/ModificationsMenu.jsx
+++ b/src/app/components/ModificationsMenu.jsx
@@ -31,6 +31,7 @@ export default class ModificationsMenu extends TranslatedComponent {
this._toggleBlueprintsMenu = this._toggleBlueprintsMenu.bind(this);
this._rollWorst = this._rollWorst.bind(this);
this._rollRandom = this._rollRandom.bind(this);
+ this._rollAverage = this._rollAverage.bind(this);
this._rollBest = this._rollBest.bind(this);
this._reset = this._reset.bind(this);
}
@@ -133,6 +134,34 @@ export default class ModificationsMenu extends TranslatedComponent {
this.props.onChange();
}
+ /**
+ * Provide an 'average' roll within the information we have
+ */
+ _rollAverage() {
+ const { m, ship } = this.props;
+ const features = m.blueprint.features[m.blueprint.grade];
+ for (const featureName in features) {
+ if (Modifications.modifications[featureName].method == 'overwrite') {
+ ship.setModification(m, featureName, (features[featureName][0] + features[featureName][1]) / 2);
+ } else {
+ let value = (features[featureName][0] + features[featureName][1]) / 2;
+ if (m.grp == 'sb' && featureName == 'shieldboost') {
+ // Shield boosters are a special case. Their boost is dependent on their base so we need to calculate the value here
+ value = ((1 + m.shieldboost) * (1 + value) - 1) / m.shieldboost - 1;
+ }
+
+ if (Modifications.modifications[featureName].type == 'percentage') {
+ ship.setModification(m, featureName, value * 10000);
+ } else if (Modifications.modifications[featureName].type == 'numeric') {
+ ship.setModification(m, featureName, value * 100);
+ }
+ }
+ }
+
+ this.setState({ modifications: this._setModifications(this.props) });
+ this.props.onChange();
+ }
+
/**
* Provide a random roll within the information we have
*/
@@ -215,6 +244,7 @@ export default class ModificationsMenu extends TranslatedComponent {
const _toggleBlueprintsMenu = this._toggleBlueprintsMenu;
const _rollBest = this._rollBest;
const _rollWorst = this._rollWorst;
+ const _rollAverage = this._rollAverage;
const _rollRandom = this._rollRandom;
const _reset = this._reset;
@@ -241,8 +271,9 @@ export default class ModificationsMenu extends TranslatedComponent {
{ translate('roll') }:
{ translate('worst') }
-
{ translate('random') }
+
{ translate('average') }
{ translate('best') }
+
{ translate('random') }
{ translate('reset') }
diff --git a/src/app/components/MovementSummary.jsx b/src/app/components/MovementSummary.jsx
index f5b31699..4b6f25df 100644
--- a/src/app/components/MovementSummary.jsx
+++ b/src/app/components/MovementSummary.jsx
@@ -1,7 +1,6 @@
import React from 'react';
import cn from 'classnames';
import TranslatedComponent from './TranslatedComponent';
-import { DamageKinetic, DamageThermal, DamageExplosive } from './SvgIcons';
/**
* Movement summary
@@ -33,7 +32,7 @@ export default class MovementSummary extends TranslatedComponent {
return (
{translate('movement summary')}
-
+
diff --git a/src/app/components/OffenceSummary.jsx b/src/app/components/OffenceSummary.jsx
index 9123ce5b..1aac8b8c 100644
--- a/src/app/components/OffenceSummary.jsx
+++ b/src/app/components/OffenceSummary.jsx
@@ -1,7 +1,7 @@
import React from 'react';
import cn from 'classnames';
import TranslatedComponent from './TranslatedComponent';
-import { DamageKinetic, DamageThermal, DamageExplosive } from './SvgIcons';
+import { DamageAbsolute, DamageKinetic, DamageThermal, DamageExplosive } from './SvgIcons';
/**
* Offence summary
@@ -34,30 +34,33 @@ export default class OffenceSummary extends TranslatedComponent {
-
{translate('dps')}: {formats.f1(ship.totalDps)}
+
{translate('dps')}: {formats.f1(ship.totalDps)}
{translate('damage by')}
+
{formats.f1(ship.totalAbsDps)}
{formats.f1(ship.totalExplDps)}
{formats.f1(ship.totalKinDps)}
{formats.f1(ship.totalThermDps)}
-
{translate('sdps')}: {formats.f1(ship.totalSDps)}
+
{translate('sdps')}: {formats.f1(ship.totalSDps)}
{translate('damage by')}
+
{formats.f1(ship.totalAbsSDps)}
{formats.f1(ship.totalExplSDps)}
{formats.f1(ship.totalKinSDps)}
{formats.f1(ship.totalThermSDps)}
-
{translate('dpe')}: {formats.f1(ship.totalDpe)}
+
{translate('dpe')}: {formats.f1(ship.totalDpe)}
{translate('damage by')}
+
{formats.f1(ship.totalAbsDpe)}
{formats.f1(ship.totalExplDpe)}
{formats.f1(ship.totalKinDpe)}
{formats.f1(ship.totalThermDpe)}
diff --git a/src/app/components/SvgIcons.jsx b/src/app/components/SvgIcons.jsx
index 6093b050..34d84118 100644
--- a/src/app/components/SvgIcons.jsx
+++ b/src/app/components/SvgIcons.jsx
@@ -319,6 +319,24 @@ export class Warning extends SvgIcon {
}
}
+/**
+ * Absolute damage
+ */
+export class DamageAbsolute extends SvgIcon {
+ /**
+ * Overriden view box
+ * @return {String} view box
+ */
+ viewBox() { return '0 0 200 200'; }
+ /**
+ * Generate the SVG
+ * @return {React.Component} SVG Contents
+ */
+ svg() {
+ return ;
+ }
+}
+
/**
* Thermal damage
*/
@@ -534,6 +552,25 @@ export class Rocket extends SvgIcon {
}
}
+/**
+ * Help
+ */
+export class Help extends SvgIcon {
+ /**
+ * Overriden view box
+ * @return {String} view box
+ */
+ viewBox() { return '0 0 200 200'; }
+
+ /**
+ * Generate the SVG
+ * @return {React.Component} SVG Contents
+ */
+ svg() {
+ return ;
+ }
+}
+
/**
* ListModifications (engineers)
*/
diff --git a/src/app/i18n/en.js b/src/app/i18n/en.js
index 03c96387..8dd9f0ca 100644
--- a/src/app/i18n/en.js
+++ b/src/app/i18n/en.js
@@ -31,6 +31,7 @@ export const terms = {
PHRASE_ENGAGEMENT_RANGE: 'The distance between your ship and its target',
PHRASE_SELECT_BLUEPRINT: 'Click to select a blueprint',
PHRASE_BLUEPRINT_WORST: 'Worst primary values for this blueprint',
+ PHRASE_BLUEPRINT_AVERAGE: 'Average primary values for this blueprint',
PHRASE_BLUEPRINT_RANDOM: 'Random selection between worst and best primary values for this blueprint',
PHRASE_BLUEPRINT_BEST: 'Best primary values for this blueprint',
PHRASE_BLUEPRINT_RESET: 'Remove all modifications and blueprint',
@@ -109,6 +110,7 @@ export const terms = {
// Blueprint rolls
worst: 'Worst',
+ average: 'Average',
random: 'Random',
best: 'Best',
reset: 'Reset',
@@ -182,4 +184,130 @@ export const terms = {
thermres: 'Thermal resistance',
wepcap: 'Weapons capacity',
weprate: 'Weapons recharge rate',
+
+ // Help text
+ HELP_TEXT: `
+
Introduction
+Coriolis is a ship builder for Elite: Dangerous. This help file provides you with the information you need to use Coriolis.
+
+
Importing Your Ship Into Coriolis
+Often, you will want to start with your existing ship in Coriolis and see how particular changes might affect it, for example upgrading your FSD. There are a number of tools that can be used to import your ship without you having to create it manually. This has the added benefit of copying over any engineering modifications that have taken place as well.
+
+
Importing Your Ship From EDDI
+To import your ship from EDDI first ensure that your connection to the Frontier servers' companion API is working. To do this check the 'Companion App' tab where you should see "Your connection to the companion app is operational". If not then follow the instructions in the companion app tab in EDDI to connect to the Frontier servers.
+
+Once you have a working companion API connection go to the 'Shipyard' tab. At the right-hand side of each ship is an 'Export to Coriolis' button that will open your default web browser in Coriolis with the ship's build.
+
+Note that Internet Explorer and Edge might not import correctly, due to their internal restrictions on URL length. If you find that this is the case then please change your default browser to Chrome.
+
+
Importing Your Ship From EDMC
+To import your ship from EDMC once your connection to the Frontier servers' companion API is working go to 'Settings ->Configuration' and set the 'Preferred Shipyard' to 'Coriolis'. Once this is set up clicking on your ship in the main window will open your default web browser in Coriolis with the ship's build.
+
+Note that Internet Explorer and Edge might not import correctly, due to their internal restrictions on URL length. If you find that this is the case then please change your default browser to Chrome.
+
+
Understanding And Using The Outfitting Panels
+The outfitting page is where you will spend most of your time, and contains the information for your ship. Information on each of the panels is provided below.
+
+
Key Values
+Along the top of the screen are some of the key values for your build. This is a handy reference for the values, but more information is provided for the values in the further panels.
+
+Here, along with most places in Coriolis, acronyms will have tooltips explaining what they mean. Hover over the acronym to obtain more detail, or look in the glossary at the end of this help.
+
+
Modules
+The next set of panels laid out horizontally across the screen contain the modules you have put in your build. From left to right these are the core modules, the internal modules, the hardpoints and the utility mounts. These represent the available slots in your ship and cannot be altered. Each slot has a class, or size, and in general any module up to a given size can fit in a given slot (exceptions being bulkheads, life support and sensors in core modules and restricted internal slots, which can only take a subset of module depending on their restrictions).
+
+To add a module to a slot left-click on the slot and select the required module. Only the modules capable of fitting in the selected slot will be shown.
+
+To remove a module from a slot right-click on the module.
+
+To move a module from one slot to another drag it. If you instead want to copy the module drag it whilst holding down the 'Alt' key.
+
+
Power Management
+The power management panel provides information about power usage and priorities. It allows you to enable and disable individual modules, as well as set power priorities for each module.
+
+
Costs
+The costs panel provides information about the costs for each of your modules, and the total cost and insurance for your build. By default Coriolis uses the standard costs, however discounts for your ship, modules and insurance can be altered in the 'Settings' at the top-right of the page.
+
+The retrofit costs provides information about the costs of changing the base build for your ship, or your saved build, to the current build.
+
+The reload costs provides information about the costs of reloading your current build.
+
+
Offence Summary
+The offence summary panel provides information about the damage that you deal with your weapons.
+
+The first headline gives an overall damage per second rating: this is the optimum amount of damage the build will do per second according to weapon statistics. After that is a breakdown of the damage per second the build will do for each type of damage: absolute, explosive, kinetic, and thermal.
+
+The next headline gives an overall sustained damage per second rating: this is the optimum amount of damage the build will do per second over a longer period of time, taking in to account ammunition clip capacities and reload times. After that is a breakdown of the sustained damage per second the build will do for each type of damage: absolute, explosive, kinetic, and thermal.
+
+The final headline gives an overall damage per energy rating: this is the amount of damage the build will do per unit of weapon capacitor energy expended. After that is a breakdown of the damage per energy the build will do for each type of damage: absolute, explosive, kinetic, and thermal.
+
+
Defence Summary
+The defence summary panel provides information about the strength of your defences and the damage that you receive from opponents.
+
+The first headline gives your total shield strength (if you have shields), taking in to account your base shield plus boosters. After that are the details of how long it will take for your shields to recover from 0 to 50% (recovery time) and from 50% to 100% (recharge time). The next line provides a breakdown of the shield damage taken from different damage types. For example, if you damage from kinetic is 60% then it means that a weapon usually dealing 10 points of damage will only deal 6, the rest being resisted by the shield. Note that this does not include any resistance alterations due to pips in your SYS capacitor.
+
+The second headline gives your total shield cell strength (if you have shield cell banks). This is the sum of the recharge of all of equipped shield cell banks.
+
+The third headline gives your total armour strength, taking in to account your base armour plus hull reinforcement packages. The next line provides a breakdown of the hull damage taken from different damage types. For example, if you damage from kinetic is 120% then it means that a weapon usually dealing 10 points of damage will deal 12.
+
+The fourth headline gives your total module protection strength from module reinforcement packages. The next line provides a breakdown of the protection for both internal and external modules whilst all module reinforcement packages are functioning. For example, if external module protection is 20% then 10 points of damage will 2 points of damage to the module reinforcement packages and 8 points of damage to the module
+
+
Movement Summary
+The movement summary panel provides information about the build's speed and agility.
+
+Along the top of this panel are the number of pips you put in to your ENG capacitor, from 0 to 4 and also include 4 pips and boost (4b). Along the side of this panel are the names of the metrics. These are:
+
+
Speed
The fastest the ship can move, in metres per second
+
Pitch
The fastest the ship can raise or lower its nose, in degrees per second
+
Roll
The fastest the ship can roll its body, in degrees per second
+
Yaw
The fastest the ship can turn its nose left or right, in degrees per second
+
+
+
Jump Range
+The jump range panel provides information about the build' jump range. The graph shows how the build's jump range changes with the amount of cargo on-board. The slider can be altered to change the amount of fuel you have on-board.
+
+
Damage Dealt
+The damage dealt panel provides information about the effectiveness of your build's weapons against opponents' shields and hull at different engagement distances.
+
+The ship against which you want to check damage dealt can be selected by clicking on the red ship icon or the red ship name at the top of this panel.
+
+The main section of this panel is a table showing your weapons and their effectiveness. Effectiveness against shields takes in to account the weapon and its engagement range, but does not consider the target ship's resistances. Effectiveness against hull takes in to account the weapon and, its engagement range and the target's hardness, but does not consider the target ship's resistances. This is because resistances will alter significantly depending on the target's build.
+
+Effective DPS and effective SDPS are the equivalent of DPS and SDPS for the weapon. Effectiveness is a percentage value that shows how effective the DPS of the weapon is compared in reality against the given target compared to the weapon's stated DPS. Effectiveness can never go above 100%.
+
+Total effective DPS, SDPS and effectiveness against both shields and hull are provided at the bottom of the table.
+
+At the bottom of this panel you can change your engagement range. The engagement range is the distance between your ship and your target. Many weapons suffer from what is known as damage falloff, where their effectiveness decreases the further the distance between your ship and your target. This allows you to model the effect of engaging at different ranges.
+
+Note that this panel only shows enabled weapons, so if you want to see your overall effectiveness for a subset of your weapons you can disable the undesired weapons in the power management panel.
+
+
Damage Received
+The damage received panel provides information about the effectiveness of your build's defences against opponent's weapons at different engagement range. Features and functions are the same as the damage dealt panel, except that it does take in to account your build's resistances.
+
+
Keyboard Shortcuts
+
+
Ctrl-e
open export dialogue (outfitting page only)
+
Ctrl-h
open help dialogue
+
Ctrl-i
open import dialogue
+
Ctrl-l
open shortlink dialogue
+
Esc
close any open dialogue
+
+
Glossary
+
+
Absolute damage
A type of damage, without any protection. Absolute damage is always dealt at 100% regardless of if the damage is to shields, hull or modules, and irrespective of resistances
+
DPS
Damage per second; the amount of damage that a weapon or a ship can deal per second to a target under optimum conditions
+
EPS
Energy per second; the amount of energy that a weapon or a ship drains from the weapons capacitor per second when firing
+
HPS
Heat per second; the amount of heat that a weapon or a ship generates per second when firing
+
Effectivness
A comparison of the maximum DPS of a given weapon to the actual DPS of the given weapon in a specific situation. DPS can be reduced by range to the target, the target's hull and shield resistances, and the target's hardness
+
Explosive damage
A type of damage, protected against by explosive resistance
+
Hardness
The inherent resistance to damage of a ship's hull. Hardness is defined on a per-ship basis and there is currently nothing that can be done to change it. Hardness of a ship's hull is compared to the piercing of weapons: if piercing is higher than hardness the weapon does 100% damage, otherwise it does a fraction of its damage calculated as piercing/hardness
+
Falloff
The distance at which a weapons starts to do less damage than its stated DPS
+
Kinetic damage
A type of damage, protected against by kinetic resistance
+
SDPS
Sustained damage per second; the amount of damage that a weapon or a ship can deal per second to a target, taking in to account ammunition reload
+
SEPS
Sustained energy per second; the amount of energy that a weapon or a ship drains from the weapons capacitor per second when firing, taking in to account ammunition reload
+
SHPS
Sustained heat per second; the amount of heat that a weapon or a ship generates per second when firing, taking in to account ammunition reload
+
Thermal damage
A type of damage, protected against by thermal resistance
+
+
+ `,
};
diff --git a/src/app/pages/OutfittingPage.jsx b/src/app/pages/OutfittingPage.jsx
index 1edadf1c..e2345fbc 100644
--- a/src/app/pages/OutfittingPage.jsx
+++ b/src/app/pages/OutfittingPage.jsx
@@ -52,6 +52,8 @@ export default class OutfittingPage extends Page {
constructor(props, context) {
super(props, context);
this.state = this._initState(context);
+ this._keyDown = this._keyDown.bind(this);
+ this._exportBuild = this._exportBuild.bind(this);
}
/**
@@ -181,7 +183,7 @@ export default class OutfittingPage extends Page {
let translate = this.context.language.translate;
let { buildName, ship } = this.state;
this.context.showModal();
@@ -258,6 +260,7 @@ export default class OutfittingPage extends Page {
*/
componentWillMount() {
this.resizeListener = this.context.onWindowResize(this._updateDimensions);
+ document.addEventListener('keydown', this._keyDown);
}
/**
@@ -281,6 +284,22 @@ export default class OutfittingPage extends Page {
this.context.showModal();
}
+ /**
+ * Handle Key Down
+ * @param {Event} e Keyboard Event
+ */
+ _keyDown(e) {
+ // .keyCode will eventually be replaced with .key
+ switch (e.keyCode) {
+ case 69: // 'e'
+ if (e.ctrlKey || e.metaKey) { // CTRL/CMD + e
+ e.preventDefault();
+ this._exportBuild();
+ }
+ break;
+ }
+ }
+
/**
* Render the Page
* @return {React.Component} The page contents
diff --git a/src/app/shipyard/Module.js b/src/app/shipyard/Module.js
index 7b58e6b4..4ca5d84d 100755
--- a/src/app/shipyard/Module.js
+++ b/src/app/shipyard/Module.js
@@ -78,6 +78,7 @@ export default class Module {
if (!modification) {
return result;
}
+
// We store percentages as decimals, so to get them back we need to divide by 10000. Otherwise
// we divide by 100. Both ways we end up with a value with two decimal places
let modValue;
@@ -292,11 +293,19 @@ export default class Module {
*/
getFalloff() {
if (this.getModValue('fallofffromrange')) {
+ // Falloff from range means what it says, so use range instead of falloff
return this.getRange();
} else {
- const falloff = this._getModifiedValue('falloff');
- const range = this.getRange();
- return (falloff > range ? range : falloff);
+ // Need to find out if we have a focused modification, in which case our falloff is scaled to range
+ if (this.blueprint && this.blueprint.name === 'Focused') {
+ const rangeMod = this.getModValue('range') / 10000;
+ return this.falloff * (1 + rangeMod);
+ } else {
+ // Standard falloff calculation
+ const range = this.getRange();
+ const falloff = this._getModifiedValue('falloff');
+ return (falloff > range ? range : falloff);
+ }
}
}
@@ -534,7 +543,10 @@ export default class Module {
* @return {Number} the clip size of this module
*/
getClip() {
- return this._getModifiedValue('clip');
+ // Clip size is always rounded up
+ let result = this._getModifiedValue('clip');
+ if (result) { result = Math.ceil(result); }
+ return result;
}
/**
diff --git a/src/app/shipyard/Ship.js b/src/app/shipyard/Ship.js
index 88ffb9b0..2d2e0f13 100755
--- a/src/app/shipyard/Ship.js
+++ b/src/app/shipyard/Ship.js
@@ -533,14 +533,17 @@ export default class Ship {
this.totalCost = this.m.incCost ? this.m.discountedCost : 0;
this.unladenMass = this.hullMass;
this.totalDpe = 0;
+ this.totalAbsDpe = 0;
this.totalExplDpe = 0;
this.totalKinDpe = 0;
this.totalThermDpe = 0;
this.totalDps = 0;
+ this.totalAbsDps = 0;
this.totalExplDps = 0;
this.totalKinDps = 0;
this.totalThermDps = 0;
this.totalSDps = 0;
+ this.totalAbsSDps = 0;
this.totalExplSDps = 0;
this.totalKinSDps = 0;
this.totalThermSDps = 0;
@@ -958,14 +961,17 @@ export default class Ship {
*/
recalculateDps() {
let totalDpe = 0;
+ let totalAbsDpe = 0;
let totalExplDpe = 0;
let totalKinDpe = 0;
let totalThermDpe = 0;
let totalDps = 0;
+ let totalAbsDps = 0;
let totalExplDps = 0;
let totalKinDps = 0;
let totalThermDps = 0;
let totalSDps = 0;
+ let totalAbsSDps = 0;
let totalExplSDps = 0;
let totalKinSDps = 0;
let totalThermSDps = 0;
@@ -981,6 +987,11 @@ export default class Ship {
totalDps += dps;
totalSDps += sdps;
if (slot.m.getDamageDist()) {
+ if (slot.m.getDamageDist().A) {
+ totalAbsDpe += dpe * slot.m.getDamageDist().A;
+ totalAbsDps += dps * slot.m.getDamageDist().A;
+ totalAbsSDps += sdps * slot.m.getDamageDist().A;
+ }
if (slot.m.getDamageDist().E) {
totalExplDpe += dpe * slot.m.getDamageDist().E;
totalExplDps += dps * slot.m.getDamageDist().E;
@@ -1001,14 +1012,17 @@ export default class Ship {
}
this.totalDpe = totalDpe;
+ this.totalAbsDpe = totalAbsDpe;
this.totalExplDpe = totalExplDpe;
this.totalKinDpe = totalKinDpe;
this.totalThermDpe = totalThermDpe;
this.totalDps = totalDps;
+ this.totalAbsDps = totalAbsDps;
this.totalExplDps = totalExplDps;
this.totalKinDps = totalKinDps;
this.totalThermDps = totalThermDps;
this.totalSDps = totalSDps;
+ this.totalAbsSDps = totalAbsSDps;
this.totalExplSDps = totalExplSDps;
this.totalKinSDps = totalKinSDps;
this.totalThermSDps = totalThermSDps;
diff --git a/src/app/utils/CompanionApiUtils.js b/src/app/utils/CompanionApiUtils.js
index 234ed48d..e1cf0d1a 100644
--- a/src/app/utils/CompanionApiUtils.js
+++ b/src/app/utils/CompanionApiUtils.js
@@ -303,7 +303,7 @@ function _addModifications(module, modifiers, blueprint, grade) {
// This is an absolute number that acts as an override
module.setModValue('burst', modifiers.modifiers[i].value * 100);
} else if (modifiers.modifiers[i].name === 'mod_weapon_burst_rof') {
- // For some reason this is a non-normalised percentage (i.e. 12.23% is 12.23 value rather than 0.1223 as everywhere else), so fix that here
+ // This is an absolute number that acts as an override
module.setModValue('burstrof', modifiers.modifiers[i].value * 100);
} else if (modifiers.modifiers[i].name === 'mod_weapon_falloffrange_from_range') {
// Obtain the falloff value directly from the range