From 8296562640fb5e39a76ccf48285884c0cbfc6aed Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Tue, 10 Dec 2024 23:23:12 +0000 Subject: [PATCH] Fix thermal and efficiency values for blueprint effects. Also fixing jump range calc and display. --- src/app/components/JumpRange.jsx | 2 +- src/app/components/PowerManagement.jsx | 1 - src/app/components/ShipSummaryTable.jsx | 10 +++++----- src/app/i18n/en.json | 4 ++-- src/app/shipyard/Ship.js | 3 +-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/app/components/JumpRange.jsx b/src/app/components/JumpRange.jsx index ff533319..6c465f16 100644 --- a/src/app/components/JumpRange.jsx +++ b/src/app/components/JumpRange.jsx @@ -57,7 +57,7 @@ export default class JumpRange extends TranslatedComponent { const fuel = this.state.fuelLevel * ship.fuelCapacity; // Obtain the jump range - return Calc.jumpRange(ship.unladenMass + fuel + cargo, fsd, fuel, ship); + return Calc.jumpRange(ship.unladenMass + cargo, fsd, fuel, ship); } /** diff --git a/src/app/components/PowerManagement.jsx b/src/app/components/PowerManagement.jsx index 97402408..ddb2f782 100644 --- a/src/app/components/PowerManagement.jsx +++ b/src/app/components/PowerManagement.jsx @@ -126,7 +126,6 @@ export default class PowerManagement extends TranslatedComponent { } // If this is a Guardian Shield Reinforcement Package or Guardian Hull Reinforcement Package, or Guardian Module Reinforcement Package, it cannot change priority - console.log(slot); let priorityField; if (m.symbol) { if (m.symbol.match(/GuardianShield/i) || m.symbol.match(/GuardianHull/i) || m.symbol.match(/GuardianModule/i)) { diff --git a/src/app/components/ShipSummaryTable.jsx b/src/app/components/ShipSummaryTable.jsx index 6f47b436..f7307e5d 100644 --- a/src/app/components/ShipSummaryTable.jsx +++ b/src/app/components/ShipSummaryTable.jsx @@ -109,11 +109,11 @@ export default class ShipSummaryTable extends TranslatedComponent { { canBoost ? {int(ship.calcSpeed(4, ship.fuelCapacity, 0, true))}{u['m/s']} : 0 } {distBoost !== 'No Boost' ? formats.time(distBoost) : 'No Boost'} {ship.boostInt && ship.boostInt !== 'undefined' ? formats.time(ship.boostInt) : 0 } - { canJump ? { f2(Calc.jumpRange(ship.unladenMass + ship.standard[2].m.getMaxFuelPerJump(), ship.standard[2].m, ship.standard[2].m.getMaxFuelPerJump(), ship))}{u.LY} : 0 } - { canJump ? {f2(Calc.jumpRange(ship.unladenMass + ship.fuelCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY} : 0 } - { canJump ? {f2(Calc.jumpRange(ship.unladenMass + ship.fuelCapacity + ship.cargoCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY} : 0 } - { canJump ? {f2(Calc.totalJumpRange(ship.unladenMass + ship.fuelCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY} : 0 } - { canJump ? {f2(Calc.totalJumpRange(ship.unladenMass + ship.fuelCapacity + ship.cargoCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY} : 0 } + { canJump ? { f2(Calc.jumpRange(ship.unladenMass - ship.fuelCapacity + ship.standard[2].m.getMaxFuelPerJump(), ship.standard[2].m, ship.standard[2].m.getMaxFuelPerJump(), ship))}{u.LY} : 0 } + { canJump ? {f2(Calc.jumpRange(ship.unladenMass, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY} : 0 } + { canJump ? {f2(Calc.jumpRange(ship.unladenMass + ship.cargoCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY} : 0 } + { canJump ? {f2(Calc.totalJumpRange(ship.unladenMass, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY} : 0 } + { canJump ? {f2(Calc.totalJumpRange(ship.unladenMass + ship.cargoCapacity, ship.standard[2].m, ship.fuelCapacity, ship))}{u.LY} : 0 } {int(ship.shield)}{u.MJ} {int(ship.armour)} {f1(ship.totalDps)} diff --git a/src/app/i18n/en.json b/src/app/i18n/en.json index 1290640c..571b5960 100644 --- a/src/app/i18n/en.json +++ b/src/app/i18n/en.json @@ -75,8 +75,8 @@ "TT_SUMMARY_SHIELDS_NONFUNCTIONAL": "No shield generator or shield generator powered off", "TT_SUMMARY_INTEGRITY": "Ship integrity, including bulkheads and hull reinforcement packages", "TT_SUMMARY_HULL_MASS": "Mass of the hull prior to any modules being installed", - "TT_SUMMARY_UNLADEN_MASS": "Mass of the hull and modules prior to any fuel or cargo", - "TT_SUMMARY_LADEN_MASS": "Mass of the hull and modules with full fuel and cargo", + "TT_SUMMARY_UNLADEN_MASS": "Mass of the hull and modules prior to any cargo or passengers", + "TT_SUMMARY_LADEN_MASS": "Mass of the hull and modules with full fuel, cargo, passengers, etc.", "TT_SUMMARY_DPS": "Damage per second with all weapons firing", "TT_SUMMARY_EPS": "WEP capacitor consumed per second with all weapons firing", "TT_SUMMARY_TTD": "Time to drain WEP capacitor with all weapons firing and 4 pips to WEP", diff --git a/src/app/shipyard/Ship.js b/src/app/shipyard/Ship.js index a4a060c3..a06f3019 100755 --- a/src/app/shipyard/Ship.js +++ b/src/app/shipyard/Ship.js @@ -1210,12 +1210,11 @@ export default class Ship { .value(); // Update global stats - this.unladenMass = unladenMass; + this.unladenMass = unladenMass + fuelCapacity; this.cargoCapacity = cargoCapacity; this.fuelCapacity = fuelCapacity; this.passengerCapacity = passengerCapacity; this.ladenMass = unladenMass + fuelCapacity + cargoCapacity; - return this; }