Final tweaks to magic effort

Stars_Without_Number_Revised/Source/Stars_Without_Number_Revised.scss

@@ -816,6 +816,16 @@ input[type=number].sheet-inline-input {
 }
 
 /* Space Magic */
+
+.sheet-magic-effort {
+	display: grid;
+	grid: auto/ auto 45px 45px 45px 45px 80px;
+	align-items: center;
+	grid-column-gap: 4px;
+	margin-top: 5px;
+	h3 { line-height: 1 }
+}
+
 .sheet-spells {
 	margin-top: 5px;
 	> .sheet-flex-center { margin-bottom: 5px }

Stars_Without_Number_Revised/Source/pug/character.pug

@@ -451,12 +451,13 @@ input(type="hidden", name="attr_setting_skill_query", value="hover").skills-quer
 				.skills-repeating
 					fieldset.repeating_magic-skills
 						+makeSkill("", true)
-				.psionics-effort.grey-box
+				.magic-effort.grey-box
 					h3(data-i18n="COMMITTED_EFFORT")
+					+text-input("magic_total_effort", "TOTAL")(type="number", value="0", min="0").center
 					+text-input("magic_committed_effort_current", "CURRENT")(type="number", value="0", min="0").center
 					+text-input("magic_committed_effort_scene", "SCENE")(type="number", value="0", min="0").center
 					+text-input("magic_committed_effort_day", "DAY")(type="number", value="0", min="0").center
-					+text-input("magic_total_effort", "TOTAL COMMITTED")(type="number", value="1", readonly, data-i18n-title="MAXIMUM_EFFORT_DESC").center
+					+text-input("magic_uncommitted_effort", "UNCOMMITTED")(type="number", value="1", readonly, data-i18n-title="MAXIMUM_EFFORT_DESC").center
 				.spells.grey-box.simple-repsection
 					.flex-center
 						h3(data-i18n="SPELLS")

Stars_Without_Number_Revised/Source/workers.js

@@ -1879,10 +1879,10 @@
 	};
 
 	const calculateMagicEffort = () => {
-		getAttrs(["magic_total_effort", "magic_committed_effort_current", "magic_committed_effort_scene", "magic_committed_effort_day"], function(v) {
-			const magic_total_effort = parseInt(v.magic_committed_effort_current) + parseInt(v.magic_committed_effort_scene) + parseInt(v.magic_committed_effort_day);
+		getAttrs(["magic_total_effort", "magic_committed_effort_current", "magic_committed_effort_scene", "magic_committed_effort_day", "magic_uncommitted_effort"], function(v) {
+			const magic_uncommitted_effort = parseInt(v.magic_total_effort) - (parseInt(v.magic_committed_effort_current) + parseInt(v.magic_committed_effort_scene) + parseInt(v.magic_committed_effort_day));
 			mySetAttrs({
-				magic_total_effort
+				magic_uncommitted_effort
 			}, v);
 		});
 	};
@@ -3472,7 +3472,7 @@
 
 	on([...effortAttributes, "repeating_psychic-skills:skill"].map(x => `change:${x}`).join(" "), calculateEffort);
 
-	on("change:magic_committed_effort_current change:magic_committed_effort_scene change: magic_committed_effort_day", calculateMagicEffort);
+	on("change:magic_committed_effort_current change:magic_committed_effort_scene change: magic_committed_effort_day change:magic_total_effort", calculateMagicEffort);
 
 	on("change:repeating_armor change:innate_ac remove:repeating_armor", calculateAC);
 

Stars_Without_Number_Revised/translation.json

@@ -999,8 +999,8 @@
 	"TOOLKIT_PRETECH_DESC": "Containing a wide range of necessary tools for a particular skill set, toolkits can handle almost any job that doesn’t require a full-scale shop or lab. A standard postech toolkit can handle electronics, small welding jobs, and basic repair on ordinary TL4 goods. More sophisticated pretech tools are necessary for working on advanced TL5 artifacts, and the tools themselves are very rare and difficult to obtain.",
 	"TOOLS_AND_MEDICAL": "Tools & Medical",
 	"TORPEDO_LAUNCHER": "Torpedo Launcher",
+	"TOTAL": "Total",
 	"TOTAL_CYBERWARE_STRAIN": "Total Cyberware Strain",
-	"TOTAL_COMMITTED": "Total Committed",
 	"TOXIN_INJECTOR": "Toxin Injector",
 	"TOXIN_INJECTOR_DESC": "The user’s canines or fingernails are altered to allow for the injection of one of two types of poison. If the user attempts to inject an unsuspecting victim they are already touching, the attempt is automatically successful. If the victim is wary or in combat, they can only be affected if they are unarmored and the user succeeds in a Punch attack roll. On a success, the victim must make a Physical saving throw at -2 or be incapacitated by the poison, dying in 1d6 rounds or being incapacitated for 1d6 hours at the user’s discretion. Each poison attack adds 2 System Strain to the user.",
 	"TRACTOR_BEAMS": "Tractor beams",