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

more dw2 work

Browse Source
This commit is contained in:
William Blythe
2018-11-28 11:31:09 +11:00
parent 08d2573d1f
commit 9360b1d574
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/shipyard/ModuleSet.js
View File

@@ -164,13 +164,14 @@ export default class ModuleSet {
/**
* Finds the lightest usable Shield Generator
* @param {number} hullMass Ship hull mass
* @return {Object} Thruster
* @param {string} rating The optional rating of the shield
* @return {Object} Shield Generator
*/
lightestShieldGenerator(hullMass) {
lightestShieldGenerator(hullMass, rating) {
let sg = this.internal.sg[0];
console.log(rating)
for (let s of this.internal.sg) {
if (s.mass < sg.mass && s.maxmass > hullMass) {
if ((s.mass < sg.mass && s.maxmass > hullMass) && (!rating || rating.toString() == s.rating)) {
sg = s;
}
}

29
src/app/shipyard/ShipRoles.js
View File

@@ -205,6 +205,25 @@ export function dw2Build(ship, tier, engineeringLevel, role, gfsb, gpp, fighter)
const slot = ship.internal.filter(e => e.eligible && e.maxClass === 3);
ship.use(slot, hrp);
} else {
const sg = ship.getAvailableModules().lightestShieldGenerator(ship.ladenMass);
const slot = ship.internal.filter(a => !a.m)
.filter(a => a.maxClass >= sg.class)
.sort((a,b) => a.maxClass.toString().localeCompare(b.maxClass.toString()))
[0];
ship.use(slot, sg);
if (engineeringLevel === 2) {
// ELP G3
const shieldBP = getBlueprint('ShieldGenerator_Optimised', ship.findShieldGenerator());
shieldBP.grade = 3;
ship.findShieldGenerator().blueprint = shieldBP;
setPercent(ship, ship.findShieldGenerator(), 100);
} else if (engineeringLevel === 3) {
// ELP G5
const shieldBP = getBlueprint('ShieldGenerator_Optimised', ship.findShieldGenerator());
shieldBP.grade = 5;
ship.findShieldGenerator().blueprint = shieldBP;
setPercent(ship, ship.findShieldGenerator(), 100);
}
// const shieldOrder = [1, 2, 3, 4, 5, 6, 7, 8].reverse();
// const shieldInternals = ship.internal.filter(a => !a.m)
// .filter(a => (!a.eligible) || a.eligible.sg)
@@ -217,12 +236,18 @@ export function dw2Build(ship, tier, engineeringLevel, role, gfsb, gpp, fighter)
// }
// }
}
} else if (tier === 3 || tier === 4) {
const sg = ship.getAvailableModules().lightestShieldGenerator(ship.ladenMass, 'A');
const slot = ship.internal.filter(a => !a.m)
.filter(a => a.maxClass >= sg.class)
.sort((a,b) => a.maxClass.toString().localeCompare(b.maxClass.toString()))
[0];
ship.use(slot, sg);
}
const pp = ship.getAvailableModules().lightestPowerPlant(ship.ladenMass, 'D');
const pp = ship.getAvailableModules().lightestPowerPlant(Math.max(ship.powerRetracted, ship.powerDeployed), 'A');
const t = ship.getAvailableModules().lightestThruster(ship.ladenMass);
ship.use(ship.standard[0], pp);
ship.use(ship.standard[1], t);
ship.use(ship.standard[0], ship.availCS.lightestPowerPlant(Math.max(ship.powerRetracted, ship.powerDeployed), 'D'))
// ship.useLightestStandard(standardOpts);
ship.updatePowerGenerated()