closes #340

Muttley · Dec 15, 2024 · 5fa4c14 · 5fa4c14
1 parent 36751b0
commit 5fa4c14
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/system/src/documents/FalloutActor.mjs b/system/src/documents/FalloutActor.mjs
@@ -146,7 +146,7 @@ export default class FalloutActor extends Actor {
 	// perk (or can't have perks)
 	//
 	perkLevel(perkName) {
-		if (!["character", "robot"].includes(this.type)) return 0;
+		if (!["character", "robot", "npc"].includes(this.type)) return 0;
 
 		const perk = this.items.find(i => {
 			const hasBabeleTranslation = i.flags?.babele?.hasTranslation === true;

diff --git a/system/src/hooks/preCreateItemHook.mjs b/system/src/hooks/preCreateItemHook.mjs
@@ -27,7 +27,7 @@ export const preCreateItemHook = {
 						warningMessage = "ONLY SETTLEMENTS CAN HAVE OBJECTS OR STRUCTURES";
 						break;
 					case "perk":
-						if (["character", "robot"].includes(parentType)) return true;
+						if (["character", "robot", "npc"].includes(parentType)) return true;
 						warningMessage = "ONLY PLAYERS CAN HAVE PERKS";
 						break;
 					case "trait":

diff --git a/system/src/sheets/FalloutNpcSheet.mjs b/system/src/sheets/FalloutNpcSheet.mjs
@@ -31,6 +31,7 @@ export default class FalloutNpcSheet extends FalloutBaseActorSheet {
 		return [
 			"skill",
 			"special_ability",
+			"perk",
 			"weapon",
 		];
 	}

diff --git a/system/templates/actor/_shared-partials/npc_special-abilities.hbs b/system/templates/actor/_shared-partials/npc_special-abilities.hbs
@@ -1,7 +1,7 @@
 <ol class="items-list">
 	<li class="consumable flexrow items-header">
 		<div class="flexrow flexlarge item-name upperC">
-			{{localize 'FALLOUT.UI.SPECIAL_ABILITY'}}
+			{{localize 'FALLOUT.UI.SPECIAL_ABILITY'}}/{{localize 'FALLOUT.TEMPLATES.PERK'}}
 		</div>
 		<div class="item-controls">
 			<a
@@ -20,6 +20,12 @@
 			</a>
 		</div>
 	</li>
+	{{#each itemsByType.perk}}
+		{{> actor/_shared-partials/simple-expandable-item
+			item=this
+			basicControlsOnly=true
+		}}
+	{{/each}}
 	{{#each itemsByType.special_ability}}
 		{{> actor/_shared-partials/simple-expandable-item
 			item=this