improve AC override checks

Muttley · Oct 7, 2023 · 991fef1 · 991fef1
1 parent 91e2bf7
commit 991fef1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/system/src/documents/ActorSD.mjs b/system/src/documents/ActorSD.mjs
@@ -865,10 +865,11 @@ export default class ActorSD extends Actor {
 		let newArmorClass = baseArmorClass;
 		let armorMasteryBonus = 0;
 
-		if (Number.isInteger(this.system.attributes.ac.override)) {
+		const acOverride = this.system.attributes.ac?.override ?? null;
+		if (Number.isInteger(acOverride)) {
 			// AC is being overridden by an effect so we just use that value
 			// and ignore everything else
-			newArmorClass = this.system.attributes.ac.override;
+			newArmorClass = acOverride;
 		}
 		else {
 			const equippedArmor = this.items.filter(

diff --git a/system/template.json b/system/template.json
@@ -9,6 +9,9 @@
 			"shared_details": {
 				"alignment": "neutral",
 				"attributes": {
+					"ac": {
+						"value": 10
+					},
 					"hp": {
 						"max": 0,
 						"value": 0
@@ -45,9 +48,6 @@
 			"attributes": {
 				"hp": {
 					"hd": 0
-				},
-				"ac": {
-					"value": 10
 				}
 			},
 			"darkAdapted": true,
@@ -370,7 +370,7 @@
 		},
 		"Talent": {
 			"templates": ["common"],
-			"level": 1,
+			"level": 0,
 			"talentClass": "level"
 		},
 		"Wand": {