Merge branch 'Develop-VJ' into cyr-power-point-ui

This commit is contained in:
TJ 2021-02-15 14:01:39 -06:00
commit 58a4033bf1
4 changed files with 4 additions and 6 deletions

View file

@ -516,7 +516,7 @@ export default class Actor5e extends Actor {
if ( Number.isNaN(i) ) continue;
if ( Number.isNumeric(lvl.foverride) ) lvl.fmax = Math.max(parseInt(lvl.foverride), 0);
else lvl.fmax = forcePowerLimit[i-1] || 0;
lvl.fvalue = parseInt(lvl.fvalue);
lvl.fvalue = Math.min(parseInt(lvl.fvalue),lvl.fmax);
}
let techPowerLimit = SW5E.powerLimit['none'];
@ -529,7 +529,7 @@ export default class Actor5e extends Actor {
if ( Number.isNaN(i) ) continue;
if ( Number.isNumeric(lvl.toverride) ) lvl.tmax = Math.max(parseInt(lvl.toverride), 0);
else lvl.tmax = techPowerLimit[i-1] || 0;
lvl.tvalue = parseInt(lvl.tvalue);
lvl.tvalue = Math.min(parseInt(lvl.tvalue),lvl.tmax);
}
// Set Force and tech power

View file

@ -292,9 +292,9 @@ function _migrateActorPowers(actorData, updateData) {
if ( !hasNewLimit ) {
for (let i = 1; i <= 9; i++) {
// add new
updateData["data.powers.power" + i + ".fvalue"] = 0;
updateData["data.powers.power" + i + ".fvalue"] = 1000;
updateData["data.powers.power" + i + ".foverride"] = null;
updateData["data.powers.power" + i + ".tvalue"] = 0;
updateData["data.powers.power" + i + ".tvalue"] = 1000;
updateData["data.powers.power" + i + ".toverride"] = null;
//remove old
updateData["data.powers.power" + i + ".-=value"] = null;