diff --git a/HeroSystem6eHeroic/HeroSystem6eHeroic.html b/HeroSystem6eHeroic/HeroSystem6eHeroic.html
index 8b553716f2..244edf706c 100644
--- a/HeroSystem6eHeroic/HeroSystem6eHeroic.html
+++ b/HeroSystem6eHeroic/HeroSystem6eHeroic.html
@@ -1579,7 +1579,7 @@
-
+
@@ -2957,6 +2957,9 @@
+
+
+
@@ -2967,6 +2970,9 @@
+
+
+
@@ -2977,6 +2983,9 @@
+
+
+
@@ -2987,6 +2996,9 @@
+
+
+
@@ -2997,6 +3009,9 @@
+
+
+
@@ -3007,6 +3022,9 @@
+
+
+
@@ -3017,6 +3035,9 @@
+
+
+
@@ -4384,8 +4405,8 @@
-
-
+
+
@@ -4682,20 +4703,6 @@
return heroRoundHigh(9+theNumber/5);
}
- function calculatePoints() {
- // Calculate points spent on characteristics, skills, powers, perks, and talents for the tally bar.
- sumCharacteristicPoints();
- sumComplicationsBenefit();
- sumPowersPerksTalents();
-
- // Placeholders until tabs are finished
- setAttrs({
- "skillsCost":0
- });
-
- // Calculate benefit of complications
- }
-
/* ------------------------- */
/* Portrait Selection */
/* ------------------------- */
@@ -5149,7 +5156,7 @@
}
// Update Strength related stats and skills
- on("change:strength", function () {
+ on("change:strength change:useCharacteristicMaximums", function () {
getAttrs(["strength","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.strength)||0;
@@ -5192,12 +5199,12 @@
});
// Update costs
- calculatePoints();
+ sumCharacteristicPoints();
});
});
// Update Dexterity
- on("change:dexterity", function () {
+ on("change:dexterity change:useCharacteristicMaximums", function () {
getAttrs(["dexterity","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.dexterity)||0;
@@ -5225,7 +5232,7 @@
});
// Update Constitution
- on("change:constitution", function () {
+ on("change:constitution change:useCharacteristicMaximums", function () {
getAttrs(["constitution","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.constitution)||0;
@@ -5253,7 +5260,7 @@
});
// Update Intelligence
- on("change:intelligence change:enhancedPerceptionModifier", function () {
+ on("change:intelligence change:enhancedPerceptionModifier change:useCharacteristicMaximums", function () {
getAttrs(["intelligence","useCharacteristicMaximums","enhancedPerceptionModifier"], function(values) {
const statValue = parseInt(values.intelligence)||0;
@@ -5291,7 +5298,7 @@
});
// Update Ego
- on("change:ego", function () {
+ on("change:ego change:useCharacteristicMaximums", function () {
getAttrs(["ego","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.ego)||0;
@@ -5319,7 +5326,7 @@
});
// Update Presence
- on("change:presence", function () {
+ on("change:presence change:useCharacteristicMaximums", function () {
getAttrs(["presence","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.presence)||0;
@@ -5349,7 +5356,7 @@
// Combat Characteristics
// Update Offensive Combat Value
- on("change:ocv", function () {
+ on("change:ocv change:useCharacteristicMaximums", function () {
getAttrs(["ocv","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.ocv)||0;
@@ -5400,7 +5407,7 @@
});
// Update hidden attribute currentDCV
- on("change:dcv change:weightDexDCVPenalty change:shieldDCV change:bonusDCVmodifier", function () {
+ on("change:dcv change:weightDexDCVPenalty change:shieldDCV change:bonusDCVmodifier change:useCharacteristicMaximums", function () {
getAttrs(["dcv","useCharacteristicMaximums","currentDCV","weightDexDCVPenalty","shieldDCV","bonusDCVmodifier"], function(values) {
const statValue = parseInt(values.dcv)||0;
@@ -5431,7 +5438,7 @@
});
// Update Mental Offensive Combat Value
- on("change:omcv", function () {
+ on("change:omcv change:useCharacteristicMaximums", function () {
getAttrs(["omcv","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.omcv)||0;
@@ -5458,7 +5465,7 @@
});
// Update Mental Defensive Combat Value
- on("change:dmcv", function () {
+ on("change:dmcv change:useCharacteristicMaximums", function () {
getAttrs(["dmcv","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.dmcv)||0;
@@ -5485,7 +5492,7 @@
});
// Update Speed
- on("change:speed", function () {
+ on("change:speed change:useCharacteristicMaximums", function () {
getAttrs(["speed","useCharacteristicMaximums"], function(values) {
let theSpeed = parseInt(values.speed)||0;
@@ -5632,7 +5639,7 @@
});
// Update Physical Defense
- on("change:pd", function () {
+ on("change:pd change:useCharacteristicMaximums", function () {
getAttrs(["pd","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.pd)||0;
@@ -5659,7 +5666,7 @@
});
// Update Energy Defense
- on("change:ed", function () {
+ on("change:ed change:useCharacteristicMaximums", function () {
getAttrs(["ed","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.ed)||0;
@@ -5686,7 +5693,7 @@
});
// Update BODY
- on("change:body", function () {
+ on("change:body change:useCharacteristicMaximums", function () {
getAttrs(["body","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.body)||0;
@@ -5713,7 +5720,7 @@
});
// Update STUN
- on("change:stun", function () {
+ on("change:stun change:useCharacteristicMaximums", function () {
getAttrs(["stun","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.stun)||0;
@@ -5740,7 +5747,7 @@
});
// Update Endurance
- on("change:endurance", function () {
+ on("change:endurance change:useCharacteristicMaximums", function () {
getAttrs(["endurance","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.endurance)||0;
@@ -5767,7 +5774,7 @@
});
// Update Recovery
- on("change:recovery", function () {
+ on("change:recovery change:useCharacteristicMaximums", function () {
getAttrs(["recovery","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.recovery)||0;
@@ -5796,7 +5803,7 @@
// Movement abilities
// Update Running
- on("change:running", function () {
+ on("change:running change:useCharacteristicMaximums", function () {
getAttrs(["running","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.running)||0;
@@ -5823,7 +5830,7 @@
});
// Update Leaping
- on("change:leaping", function () {
+ on("change:leaping change:useCharacteristicMaximums", function () {
getAttrs(["leaping","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.leaping)||0;
@@ -5850,7 +5857,7 @@
});
// Update Swimming
- on("change:swimming", function () {
+ on("change:swimming change:useCharacteristicMaximums", function () {
getAttrs(["swimming","useCharacteristicMaximums"], function(values) {
const statValue = parseInt(values.swimming)||0;
@@ -5876,6 +5883,14 @@
});
});
+
+ // Update point totals when option: useCharacteristicMaximums checked or unchecked.
+ on("change:useCharacteristicMaximums", function () {
+ sumCharacteristicPoints();
+
+ });
+
+
/* -------------------------------------- */
/* Functions used for tally bar */
/* -------------------------------------- */
@@ -8687,6 +8702,18 @@
skillBaseCost = 0;
break;
+ case "PSL1": skillLevelCost=1;
+ skillBaseCost = 0;
+ break;
+
+ case "PSL2": skillLevelCost=2;
+ skillBaseCost = 0;
+ break;
+
+ case "PSL3": skillLevelCost=3;
+ skillBaseCost = 0;
+ break;
+
default: skillLevelCost=0;
skillBaseCost = 0;
break;
@@ -10616,6 +10643,7 @@
});
});
+
/* ---------------- */
/* Equipment Movers */
/* ---------------- */