diff --git a/module/actor/entity.js b/module/actor/entity.js
index 2cfe2a58..c3a4418c 100644
--- a/module/actor/entity.js
+++ b/module/actor/entity.js
@@ -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.max(parseInt(lvl.tvalue),lvl.tmax);
}
// Set Force and tech power
diff --git a/module/migration.js b/module/migration.js
index 1998c524..dc832995 100644
--- a/module/migration.js
+++ b/module/migration.js
@@ -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;
diff --git a/packs/packs/classfeatures.db b/packs/packs/classfeatures.db
index c0574245..1b1bd70b 100644
--- a/packs/packs/classfeatures.db
+++ b/packs/packs/classfeatures.db
@@ -740,4 +740,3 @@
{"_id":"zxw8tBx6Z30RKyLr","name":"Rampage","permission":{"default":0,"lwoKvFakziGOHjXS":3},"type":"classfeature","data":{"description":{"value":"At 6th level, while raging, when you deal damage with a blaster with which you are proficient, and you added your Strength modifier to the damage roll, you can use a bonus action to move up to half your speed towards your target. You must end this movement closer to your target than you started. If you end this movement within 5 feet of your target, you can make one melee weapon attack with your blaster as a part of this bonus action.
","chat":"","unidentified":""},"source":"PHB","activation":{"type":"bonus","cost":0,"condition":""},"duration":{"value":null,"units":""},"target":{"value":null,"width":null,"units":"","type":""},"range":{"value":null,"long":null,"units":""},"uses":{"value":0,"max":0,"per":""},"consume":{"type":"","target":"","amount":null},"ability":null,"actionType":"","attackBonus":0,"chatFlavor":"","critical":null,"damage":{"parts":[],"versatile":""},"formula":"","save":{"ability":"","dc":null,"scaling":"power"},"className":"","recharge":{"value":null,"charged":false}},"flags":{},"img":"icons/svg/mystery-man.svg","effects":[]}
{"_id":"zzbwoqUNCb6U0lRK","name":"Unarmored Movement","permission":{"default":0,"lwoKvFakziGOHjXS":3},"type":"classfeature","data":{"description":{"value":"Starting at 3rd level, your speed increases by 10 feet while you are not wearing armor or wielding a shield. This bonus increases when you reach certain monk levels, as shown in the table below.
\nAt 9th level, you gain the ability to move along vertical surfaces and across liquids on your turn without falling during the move.
\n\n\n\n| Level | \nUnarmored Movement | \n
\n\n\n\n| 1st | \n- | \n
\n\n| 2nd | \n- | \n
\n\n| 3rd | \n+10 ft. | \n
\n\n| 4th | \n+10 ft. | \n
\n\n| 5th | \n+15 ft. | \n
\n\n| 6th | \n+15 ft. | \n
\n\n| 7th | \n+15 ft. | \n
\n\n| 8th | \n+15 ft. | \n
\n\n| 9th | \n+20 ft. | \n
\n\n| 10th | \n+20 ft. | \n
\n\n| 11th | \n+20 ft. | \n
\n\n| 12th | \n+20 ft. | \n
\n\n| 13th | \n+25 ft. | \n
\n\n| 14th | \n+25 ft. | \n
\n\n| 15th | \n+25 ft. | \n
\n\n| 16th | \n+25 ft. | \n
\n\n| 17th | \n+30 ft. | \n
\n\n| 18th | \n+30 ft. | \n
\n\n| 19th | \n+30 ft. | \n
\n\n| 20th | \n+30 ft. | \n
\n\n
","chat":"","unidentified":""},"source":"PHB","activation":{"type":"","cost":0,"condition":""},"duration":{"value":null,"units":""},"target":{"value":null,"width":null,"units":"","type":""},"range":{"value":null,"long":null,"units":""},"uses":{"value":0,"max":0,"per":null},"consume":{"type":"","target":null,"amount":null},"ability":null,"actionType":"","attackBonus":0,"chatFlavor":"","critical":null,"damage":{"parts":[],"versatile":""},"formula":"","save":{"ability":"","dc":null,"scaling":"power"},"className":""},"flags":{},"img":"icons/svg/mystery-man.svg","effects":[]}
{"_id":"zztRtikqjZ4bFjV0","name":"Invasive Presence","permission":{"default":0,"lwoKvFakziGOHjXS":3},"type":"classfeature","data":{"description":{"value":"At 7th level, your spirit can invade another creature’s being. As an action, your spirit can touch a creature within 5 feet of it, forcing it to make a Wisdom saving throw against your universal force save DC. If you or creatures that are friendly to you are fighting it, it has advantage on the saving throw.
\nOn a failed save, your spirit moves into that creatures space, inhabiting its body, for 1 minute. The affected creature has disadvantage on the first attack roll, ability check, or saving throw it makes each turn. At the end of each its turns, the creature repeats this save. On a success, it repels the spirit from its body, and it becomes immune to this feature for 24 hours.
\nOnce you’ve used this feature, you must complete a long rest before you can use it again.
\n
","chat":"","unidentified":""},"source":"EC","activation":{"type":"action","cost":0,"condition":""},"duration":{"value":null,"units":""},"target":{"value":null,"width":null,"units":"","type":""},"range":{"value":null,"long":null,"units":""},"uses":{"value":1,"max":1,"per":"lr"},"consume":{"type":"","target":"","amount":null},"ability":null,"actionType":"","attackBonus":0,"chatFlavor":"","critical":null,"damage":{"parts":[],"versatile":""},"formula":"","save":{"ability":"","dc":null,"scaling":"power"},"className":"","recharge":{"value":null,"charged":false}},"flags":{},"img":"icons/svg/mystery-man.svg","effects":[]}
-
diff --git a/packs/packs/fightingmasteries.db b/packs/packs/fightingmasteries.db
index b9e0b9b7..273ada07 100644
--- a/packs/packs/fightingmasteries.db
+++ b/packs/packs/fightingmasteries.db
@@ -22,4 +22,3 @@
{"_id":"rA2qg1EsfHHJMii9","name":"Sharpshooter Mastery","permission":{"default":0,"IpSq6HI4edO6e0Yw":3},"type":"fightingmastery","data":{"description":{"value":"You've mastered blaster weapons and can easily make shots that others find impossible. While you are wielding a blaster weapon with which you are proficient, you gain the following benefits:
- Attacking at long range doesn't impose disadvantage on your ranged weapon attack rolls.
- Your ranged weapon attacks ignore one-quarter and half cover against targets 30 feet or greater from you. If your ranged weapon attacks would already ignore one-quarter and half cover against targets 30 feet or greater from you, they now also ignore three-quarters cover.
- Before you make an attack with a blaster weapon against a target 30 feet or greater from you, you can choose to forgo your proficiency bonus. If the attack hits, you add twice your proficiency bonus to the attack's damage.
"},"source":{"value":"PHB"}},"flags":{},"img":"systems/sw5e/packs/Icons/Fighting%20Styles%20and%20Masteries/Sharpshooter%20Mastery.webp","effects":[]}
{"_id":"tE6vpjscEkvcoSjW","name":"Disruption Mastery","permission":{"default":0,"IpSq6HI4edO6e0Yw":3},"type":"fightingmastery","data":{"description":{"value":"Choose one from force- or tech-casting. You've mastered fighting and interfering with casters of the chosen type, confounding their concentration. You gain the following benefits:
- When a creature within 30 feet of you that you can see casts a power, they provoke an opportunity attack from you.
- Whenever you force a creature to make a saving throw to maintain concentration, the DC for the saving throw increases by an amount equal to your proficiency bonus.
- You have advantage on saving throws against powers cast by creatures you can see if you've dealt damage to them since the start of your last turn.
"},"source":{"value":"PHB"}},"flags":{},"img":"systems/sw5e/packs/Icons/Fighting%20Styles%20and%20Masteries/Disruption%20Mastery.webp","effects":[]}
{"_id":"tTvAn3HGUR7XfItH","name":"Berserk Mastery","permission":{"default":0,"IpSq6HI4edO6e0Yw":3},"type":"fightingmastery","data":{"description":{"value":"You've mastered returning pain to those who deliver it, becoming a scourge on the battlefield. You gain the following benefits:
- When a creature within 5 feet of you deals damage to you with a weapon or unarmed strike, you can use your reaction to make a melee weapon attack or unarmed strike against that creature. On a hit, you deal additional damage equal to your proficiency bonus.
- When a creature scores a critical hit against you, you have advantage on the first attack you make against that creature before the end of your next turn. If you would already have advantage, you can instead reroll one of the dice once.
- You have advantage on saving throws that would force you to act against your will, be frightened, or prevent you from attacking a creature.
"},"source":{"value":"PHB"}},"flags":{},"img":"systems/sw5e/packs/Icons/Fighting%20Styles%20and%20Masteries/Berserk%20Mastery.webp","effects":[]}
-{"_id":"Nr7mzeFLEUrqVK7G","name":"Akimbo Mastery","permission":{"default":0,"IpSq6HI4edO6e0Yw":3},"type":"fightingmastery","data":{"description":{"value":"You've mastered fighting with two blasters, unleashing a volley of shots. While you are wielding separate weapons in each hand with which you are proficient, you gain the following benefits:
- When you roll the maximum on a weapon damage die against a creature, that creature suffers a -1 penalty on the first attack roll it makes before the start of your next turn.
- You can engage in Two-Weapon Fighting even when the weapons you are wielding lack the light property.
- You can reload two weapons when you would normally only be able to reload only one.
- When you take the Attack action, you can choose to attack swiftly at the expense of accuracy. Your weapon attack is made without the aid of your proficiency bonus, but you can use your reaction to attack with a different weapon that you're holding in the other hand, also without your proficiency bonus. If you would make more than one attack when you take the Attack action, only one attack is made without your proficiency bonus.
"},"source":{"value":"PHB"}},"flags":{},"img":"systems/sw5e/packs/Icons/Fighting%20Styles%20and%20Masteries/Akimbo%20Mastery.webp","effects":[]}