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

Merge pull request #381 from EDCD/feature/stats

Browse Source 
Modules return null instead of undefined when a value is not given
This commit is contained in:
William
2018-09-14 09:10:53 +10:00
committed by GitHub
parent 8c4957c21e b6c83f4aba
commit 00f4889c93
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,11 +136,13 @@ export default class Module {
* @return {Number} The value queried
*/
_getValue(name, modified) {
let val;
if (modified) {
return this._getModifiedValue(name);
val = this._getModifiedValue(name);
} else {
return this[name];
val = this[name];
}
return isNaN(val) ? null : val;
}
/**
@@ -195,7 +197,7 @@ export default class Module {
}
}
return result;
return isNaN(result) ? null : result;
}
/**

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

@@ -281,7 +281,7 @@ function _addModifications(module, modifiers, blueprint, grade, specialModificat
if (modifiers[i].Label.search('Resistance') >= 0) {
value = (modifiers[i].Value * 100) - (modifiers[i].OriginalValue * 100);
}
if (modifiers[i].Label.search('ShieldMultiplier') >= 0) {
if (modifiers[i].Label.search('ShieldMultiplier') >= 0 || modifiers[i].Label.search('DefenceModifierHealthMultiplier') >= 0) {
value = ((100 + modifiers[i].Value) / (100 + modifiers[i].OriginalValue) * 100 - 100) * 100;
}