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

Merge pull request #354 from EDCD/feature/caustic

Browse Source 
Bug fixes introduced with caustic damage calculation
This commit is contained in:
William
2018-08-30 08:20:01 +10:00
committed by GitHub
parent 242c3efe45 df14786e79
commit 86c53c8e46
2 changed files with 139 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/components/ShipSummaryTable.jsx
View File

@@ -63,6 +63,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
shieldColour shieldColour
}; };
return <div id='summary'> return <div id='summary'>
<div style={{display: "table", width: "100%"}}>
<div style={{display: "table-row"}}> <div style={{display: "table-row"}}>
<table className={'summaryTable'}> <table className={'summaryTable'}>
<thead> <thead>
@@ -205,7 +206,7 @@ export default class ShipSummaryTable extends TranslatedComponent {
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</div>; </div>;
} }
} }

2
src/app/shipyard/Calculations.js
View File

@@ -659,7 +659,7 @@ export function armourMetrics(ship) {
let armourCausDmg = diminishDamageMult(0.7, 1 - ship.bulkheads.m.getCausticResistance()); let armourCausDmg = diminishDamageMult(0.7, 1 - ship.bulkheads.m.getCausticResistance());
let armourReinforcedCausDmg = diminishDamageMult(0.7, (1 - ship.bulkheads.m.getCausticResistance()) * hullCausDmg); let armourReinforcedCausDmg = diminishDamageMult(0.7, (1 - ship.bulkheads.m.getCausticResistance()) * hullCausDmg);
armour.caustic = { armour.caustic = {
bulkeads: armourCausDmg, bulkheads: armourCausDmg,
reinforcement: armourReinforcedCausDmg / armourCausDmg, reinforcement: armourReinforcedCausDmg / armourCausDmg,
total: armourReinforcedCausDmg, total: armourReinforcedCausDmg,
res: 1 - armourReinforcedCausDmg, res: 1 - armourReinforcedCausDmg,