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

Merge branch 'develop'

Browse Source
This commit is contained in:
willyb321
2018-06-15 10:58:19 +10:00
parent 5a02368298 737837eebd
commit e21f109026
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,7 @@ export function calcSpeed(mass, baseSpeed, thrusters, engpip, eng, boostFactor,
* Calculate pitch for a given setup * Calculate pitch for a given setup
* @param {number} mass the mass of the ship * @param {number} mass the mass of the ship
* @param {number} basePitch the base pitch of the ship * @param {number} basePitch the base pitch of the ship
* @param {ojbect} thrusters the thrusters of the ship * @param {object} thrusters the thrusters of the ship
* @param {number} engpip the multiplier per pip to engines * @param {number} engpip the multiplier per pip to engines
* @param {number} eng the pips to engines * @param {number} eng the pips to engines
* @param {number} boostFactor the boost factor for ths ship * @param {number} boostFactor the boost factor for ths ship
@@ -455,7 +455,7 @@ export function shieldMetrics(ship, sys) {
/** /**
* Calculate time from one boost to another * Calculate time from one boost to another
* @return {number} Boost frequency in seconds * @return {number} Boost frequency in seconds
* @param ship * @param {Ship} ship Ship object
*/ */
export function calcBoost(ship) { export function calcBoost(ship) {
if (!ship.boostEnergy || !ship.standard[4] || !ship.standard[4].m) { if (!ship.boostEnergy || !ship.standard[4] || !ship.standard[4].m) {

2
src/app/utils/ShortenUrl.js
View File

@@ -86,7 +86,7 @@ function shortenUrlOrbis(url, success, error) {
} }
}); });
} catch (e) { } catch (e) {
console.log(e) console.log(e);
error(e.message ? e.message : e); error(e.message ? e.message : e);
} }
} else { } else {