Merge branch 'master' into equip-items-in-character-sheet

now using cleaned up template
This commit is contained in:
Gesina Schwalbe 2021-01-03 21:14:11 +01:00
commit fb780ae4c2
25 changed files with 639 additions and 321 deletions

View file

@ -21,9 +21,9 @@ export const DS4 = {
* Define the file paths to icon images
*/
attackTypesIcons: {
melee: "systems/ds4/assets/DS4-MAT.png",
meleeRanged: "systems/ds4/assets/DS4-MRA.png",
ranged: "systems/ds4/assets/DS4-RAT.png",
melee: "systems/ds4/assets/official/DS4-MAT.png",
meleeRanged: "systems/ds4/assets/official/DS4-MRA.png",
ranged: "systems/ds4/assets/official/DS4-RAT.png",
},
/**

View file

@ -36,7 +36,7 @@ async function registerHandlebarsPartials() {
"systems/ds4/templates/item/partials/details.hbs",
"systems/ds4/templates/item/partials/effects.hbs",
"systems/ds4/templates/item/partials/body.hbs",
"systems/ds4/templates/actor/partials/items.hbs",
"systems/ds4/templates/actor/partials/items-overview.hbs",
];
return loadTemplates(templatePaths);
}