Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-10 07:05:35 +00:00
Code Issues Projects Releases Wiki Activity

Use damage distribution numbers

Browse Source
This commit is contained in:
Cmdr McDonald
2017-01-15 17:10:46 +00:00
parent 1e5f66e528
commit 5bbc6e1cbe
7 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.md
View File

@@ -1,5 +1,6 @@
#2.2.10 #2.2.10
* Fix detailed export of module reinforcement packages * Fix detailed export of module reinforcement packages
* Use damagedist for exact breakdown of weapons that have more than one type of damage
#2.2.9 #2.2.9
* Use SSL-enabled server for shortlinks * Use SSL-enabled server for shortlinks

2
src/app/components/DamageDealt.jsx
View File

@@ -153,7 +153,7 @@ export default class DamageDealt extends TranslatedComponent {
} }
totals.effectiveness = totals.effectiveDps / totalDps; totals.effectiveness = totals.effectiveDps / totalDps;
return {weapons: weapons, totals: totals}; return { weapons, totals };
} }
/** /**

36
src/app/components/DamageReceived.jsx
View File

@@ -93,7 +93,7 @@ export default class DamageReceived extends TranslatedComponent {
let weapons = []; let weapons = [];
for (let grp in Modules.hardpoints) { for (let grp in Modules.hardpoints) {
if (Modules.hardpoints[grp][0].damage && Modules.hardpoints[grp][0].type) { if (Modules.hardpoints[grp][0].damage && Modules.hardpoints[grp][0].damagedist) {
for (let mId in Modules.hardpoints[grp]) { for (let mId in Modules.hardpoints[grp]) {
const m = new Module(Modules.hardpoints[grp][mId]); const m = new Module(Modules.hardpoints[grp][mId]);
const classRating = `${m.class}${m.rating}${m.missile ? '/' + m.missile : ''}`; const classRating = `${m.class}${m.rating}${m.missile ? '/' + m.missile : ''}`;
@@ -104,37 +104,35 @@ export default class DamageReceived extends TranslatedComponent {
// Effective DPS taking in to account shield resistance // Effective DPS taking in to account shield resistance
let effectivenessShields = 0; let effectivenessShields = 0;
if (m.getDamageType().indexOf('E') != -1) { if (m.getDamageDist().E) {
effectivenessShields += (1 - ship.shieldExplRes); effectivenessShields += m.getDamageDist().E * (1 - ship.shieldExplRes);
} }
if (m.getDamageType().indexOf('K') != -1) { if (m.getDamageDist().K) {
effectivenessShields += (1 - ship.shieldKinRes); effectivenessShields += m.getDamageDist().K * (1 - ship.shieldKinRes);
} }
if (m.getDamageType().indexOf('T') != -1) { if (m.getDamageDist().T) {
effectivenessShields += (1 - ship.shieldThermRes); effectivenessShields += m.getDamageDist().T * (1 - ship.shieldThermRes);
} }
if (m.getDamageType().indexOf('A') != -1) { if (m.getDamageDist().A) {
effectivenessShields += 1; effectivenessShields += m.getDamageDist().A;
} }
effectivenessShields /= m.getDamageType().length;
const effectiveDpsShields = baseDps * effectivenessShields; const effectiveDpsShields = baseDps * effectivenessShields;
const effectiveSDpsShields = baseSDps * effectivenessShields; const effectiveSDpsShields = baseSDps * effectivenessShields;
// Effective DPS taking in to account hull hardness and resistance // Effective DPS taking in to account hull hardness and resistance
let effectivenessHull = 0; let effectivenessHull = 0;
if (m.getDamageType().indexOf('E') != -1) { if (m.getDamageDist().E) {
effectivenessHull += (1 - ship.hullExplRes); effectivenessHull += m.getDamageDist().E * (1 - ship.hullExplRes);
} }
if (m.getDamageType().indexOf('K') != -1) { if (m.getDamageDist().K) {
effectivenessHull += (1 - ship.hullKinRes); effectivenessHull += m.getDamageDist().K * (1 - ship.hullKinRes);
} }
if (m.getDamageType().indexOf('T') != -1) { if (m.getDamageDist().T) {
effectivenessHull += (1 - ship.hullThermRes); effectivenessHull += m.getDamageDist().T * (1 - ship.hullThermRes);
} }
if (m.getDamageType().indexOf('A') != -1) { if (m.getDamageDist().A) {
effectivenessHull += 1; effectivenessHull += m.getDamageDist().A;
} }
effectivenessHull /= m.getDamageType().length;
effectivenessHull *= Math.min(m.getPiercing() / ship.hardness, 1); effectivenessHull *= Math.min(m.getPiercing() / ship.hardness, 1);
const effectiveDpsHull = baseDps * effectivenessHull; const effectiveDpsHull = baseDps * effectivenessHull;
const effectiveSDpsHull = baseSDps * effectivenessHull; const effectiveSDpsHull = baseSDps * effectivenessHull;

6
src/app/components/HardpointSlot.jsx
View File

@@ -59,9 +59,9 @@ export default class HardpointSlot extends Slot {
{m.mount && m.mount == 'F' ? <span onMouseOver={termtip.bind(null, 'fixed')} onMouseOut={tooltip.bind(null, null)}><MountFixed /></span> : ''} {m.mount && m.mount == 'F' ? <span onMouseOver={termtip.bind(null, 'fixed')} onMouseOut={tooltip.bind(null, null)}><MountFixed /></span> : ''}
{m.mount && m.mount == 'G' ? <span onMouseOver={termtip.bind(null, 'gimballed')} onMouseOut={tooltip.bind(null, null)}><MountGimballed /></span> : ''} {m.mount && m.mount == 'G' ? <span onMouseOver={termtip.bind(null, 'gimballed')} onMouseOut={tooltip.bind(null, null)}><MountGimballed /></span> : ''}
{m.mount && m.mount == 'T' ? <span onMouseOver={termtip.bind(null, 'turreted')} onMouseOut={tooltip.bind(null, null)}><MountTurret /></span> : ''} {m.mount && m.mount == 'T' ? <span onMouseOver={termtip.bind(null, 'turreted')} onMouseOut={tooltip.bind(null, null)}><MountTurret /></span> : ''}
{m.getDamageType() && m.getDamageType().match('K') ? <span onMouseOver={termtip.bind(null, 'kinetic')} onMouseOut={tooltip.bind(null, null)}><DamageKinetic /></span> : ''} {m.getDamageDist() && m.getDamageDist().K ? <span onMouseOver={termtip.bind(null, 'kinetic')} onMouseOut={tooltip.bind(null, null)}><DamageKinetic /></span> : ''}
{m.getDamageType() && m.getDamageType().match('T') ? <span onMouseOver={termtip.bind(null, 'thermal')} onMouseOut={tooltip.bind(null, null)}><DamageThermal /></span> : ''} {m.getDamageDist() && m.getDamageDist().T ? <span onMouseOver={termtip.bind(null, 'thermal')} onMouseOut={tooltip.bind(null, null)}><DamageThermal /></span> : ''}
{m.getDamageType() && m.getDamageType().match('E') ? <span onMouseOver={termtip.bind(null, 'explosive')} onMouseOut={tooltip.bind(null, null)}><DamageExplosive /></span> : ''} {m.getDamageDist() && m.getDamageDist().E ? <span onMouseOver={termtip.bind(null, 'explosive')} onMouseOut={tooltip.bind(null, null)}><DamageExplosive /></span> : ''}
{classRating} {translate(m.name || m.grp)}{ m.mods && Object.keys(m.mods).length > 0 ? <span className='r' onMouseOver={termtip.bind(null, modTT)} onMouseOut={tooltip.bind(null, null)}><Modified /></span> : null } {classRating} {translate(m.name || m.grp)}{ m.mods && Object.keys(m.mods).length > 0 ? <span className='r' onMouseOver={termtip.bind(null, modTT)} onMouseOut={tooltip.bind(null, null)}><Modified /></span> : null }
</div> </div>

4
src/app/components/Modification.jsx
View File

@@ -63,8 +63,8 @@ export default class Modification extends TranslatedComponent {
let translate = this.context.language.translate; let translate = this.context.language.translate;
let name = this.props.name; let name = this.props.name;
if (name === 'type') { if (name === 'damagedist') {
// We don't show type // We don't show damage distribution
return null; return null;
} }

8
src/app/shipyard/Module.js
View File

@@ -650,10 +650,10 @@ export default class Module {
} }
/** /**
* Get the damage type for this module, taking in to account modifications * Get the damage distribution for this module, taking in to account modifications
* @return {string} the damage types for this module; any combination of E T and K * @return {string} the damage distribution for this module
*/ */
getDamageType() { getDamageDist() {
return this.getModValue('type') || this.type; return this.getModValue('damagedist') || this.damagedist;
} }
} }

30
src/app/shipyard/Ship.js
View File

@@ -954,20 +954,22 @@ export default class Ship {
totalDpe += dpe; totalDpe += dpe;
totalDps += dps; totalDps += dps;
totalSDps += sdps; totalSDps += sdps;
if (slot.m.getDamageType().indexOf('E') != -1) { if (slot.m.getDamageDist()) {
totalExplDpe += dpe / slot.m.getDamageType().length; if (slot.m.getDamageDist().E) {
totalExplDps += dps / slot.m.getDamageType().length; totalExplDpe += dpe * slot.m.getDamageDist().E;
totalExplSDps += sdps / slot.m.getDamageType().length; totalExplDps += dps * slot.m.getDamageDist().E;
} totalExplSDps += sdps * slot.m.getDamageDist().E;
if (slot.m.getDamageType().indexOf('K') != -1) { }
totalKinDpe += dpe / slot.m.getDamageType().length; if (slot.m.getDamageDist().K) {
totalKinDps += dps / slot.m.getDamageType().length; totalKinDpe += dpe * slot.m.getDamageDist().K;
totalKinSDps += sdps / slot.m.getDamageType().length; totalKinDps += dps * slot.m.getDamageDist().K;
} totalKinSDps += sdps * slot.m.getDamageDist().K;
if (slot.m.getDamageType().indexOf('T') != -1) { }
totalThermDpe += dpe / slot.m.getDamageType().length; if (slot.m.getDamageDist().T) {
totalThermDps += dps / slot.m.getDamageType().length; totalThermDpe += dpe * slot.m.getDamageDist().T;
totalThermSDps += sdps / slot.m.getDamageType().length; totalThermDps += dps * slot.m.getDamageDist().T;
totalThermSDps += sdps * slot.m.getDamageDist().T;
}
} }
} }
} }