diff --git a/module/actor/sheets/newSheet/character.js b/module/actor/sheets/newSheet/character.js index 61efb482..9cd2bf03 100644 --- a/module/actor/sheets/newSheet/character.js +++ b/module/actor/sheets/newSheet/character.js @@ -79,9 +79,9 @@ export default class ActorSheet5eCharacterNew extends ActorSheet5e { backpack: { label: "SW5E.ItemTypeContainerPl", items: [], dataset: {type: "backpack"} }, loot: { label: "SW5E.ItemTypeLootPl", items: [], dataset: {type: "loot"} } }; - + // Partition items by category - let [items, powers, feats, classes, species, archetypes, classfeatures, backgrounds, lightsaberforms, fightingstyles] = data.items.reduce((arr, item) => { + let [items, powers, feats, classes, species, archetypes, classfeatures, backgrounds, fightingstyles, fightingmasteries, lightsaberforms] = data.items.reduce((arr, item) => { // Item details item.img = item.img || DEFAULT_TOKEN; @@ -100,15 +100,16 @@ export default class ActorSheet5eCharacterNew extends ActorSheet5e { if ( item.type === "power" ) arr[1].push(item); else if ( item.type === "feat" ) arr[2].push(item); else if ( item.type === "class" ) arr[3].push(item); - else if ( item.type === "species" ) arr[4].push(item); - else if ( item.type === "archetype" ) arr[5].push(item); - else if ( item.type === "classfeature" ) arr[6].push(item); - else if ( item.type === "background" ) arr[7].push(item); - else if ( item.type === "lightsaberform" ) arr[8].push(item); - else if (item.type === "fightingstyle") arr[9].push(item); + else if ( item.type === "species" ) arr[4].push(item); + else if ( item.type === "archetype" ) arr[5].push(item); + else if ( item.type === "classfeature" ) arr[6].push(item); + else if ( item.type === "background" ) arr[7].push(item); + else if ( item.type === "fightingstyle" ) arr[8].push(item); + else if ( item.type === "fightingmastery" ) arr[9].push(item); + else if ( item.type === "lightsaberform" ) arr[10].push(item); else if ( Object.keys(inventory).includes(item.type ) ) arr[0].push(item); return arr; - }, [[], [], [], [], [], [], [], [], [], []]); + }, [[], [], [], [], [], [], [], [], [], [], []]); // Apply active item filters items = this._filterItems(items, this._filters.inventory); @@ -132,13 +133,13 @@ export default class ActorSheet5eCharacterNew extends ActorSheet5e { // Organize Features const features = { classes: { label: "SW5E.ItemTypeClassPl", items: [], hasActions: false, dataset: {type: "class"}, isClass: true }, - classfeatures: { label: "SW5E.ItemTypeClassFeats", items: [], hasActions: true, dataset: {type: "classfeature"}, isClassfeature: true }, - archetype: { label: "SW5E.ItemTypeArchetype", items: [], hasActions: false, dataset: {type: "archetype"}, isArchetype: true }, - species: { label: "SW5E.ItemTypeSpecies", items: [], hasActions: false, dataset: {type: "species"}, isSpecies: true }, - background: { label: "SW5E.ItemTypeBackground", items: [], hasActions: false, dataset: {type: "background"}, isBackground: true }, - lightsaberform: { label: "SW5E.ItemTypeLightsaberForm", items: [], hasActions: false, dataset: {type: "lightsaberform"}, isLightsaberform: true }, - + archetype: { label: "SW5E.ItemTypeArchetype", items: [], hasActions: false, dataset: {type: "archetype"}, isArchetype: true }, + species: { label: "SW5E.ItemTypeSpecies", items: [], hasActions: false, dataset: {type: "species"}, isSpecies: true }, + background: { label: "SW5E.ItemTypeBackground", items: [], hasActions: false, dataset: {type: "background"}, isBackground: true }, + fightingstyles: { label: "SW5E.ItemTypeFightingStylePl", items: [], hasActions: false, dataset: {type: "fightingstyle"}, isFightingstyle: true }, + fightingmasteries: { label: "SW5E.ItemTypeFightingMasteryPl", items: [], hasActions: false, dataset: {type: "fightingmastery"}, isFightingmastery: true }, + lightsaberforms: { label: "SW5E.ItemTypeLightsaberFormPl", items: [], hasActions: false, dataset: {type: "lightsaberform"}, isLightsaberform: true }, active: { label: "SW5E.FeatureActive", items: [], hasActions: true, dataset: {type: "feat", "activation.type": "action"} }, passive: { label: "SW5E.FeaturePassive", items: [], hasActions: false, dataset: {type: "feat"} } }; @@ -152,8 +153,9 @@ export default class ActorSheet5eCharacterNew extends ActorSheet5e { features.archetype.items = archetypes; features.species.items = species; features.background.items = backgrounds; - features.lightsaberform.items = lightsaberforms; features.fightingstyles.items = fightingstyles; + features.fightingmasteries.items = fightingmasteries; + features.lightsaberforms.items = lightsaberforms; // Assign and return data.inventory = Object.values(inventory); @@ -639,4 +641,4 @@ async function addSubTabs(app, html, data) { Hooks.on("renderActorSheet5eCharacterNew", (app, html, data) => { addFavorites(app, html, data); addSubTabs(app, html, data); -}); \ No newline at end of file +});