diff --git a/system/scripts/actor-l5r5e.js b/system/scripts/actor.js
similarity index 100%
rename from system/scripts/actor-l5r5e.js
rename to system/scripts/actor.js
diff --git a/system/scripts/sheets/base-sheet.js b/system/scripts/actors/base-sheet.js
similarity index 100%
rename from system/scripts/sheets/base-sheet.js
rename to system/scripts/actors/base-sheet.js
diff --git a/system/scripts/sheets/actor-sheet.js b/system/scripts/actors/character-sheet.js
similarity index 90%
rename from system/scripts/sheets/actor-sheet.js
rename to system/scripts/actors/character-sheet.js
index 60f56be..3da0efb 100644
--- a/system/scripts/sheets/actor-sheet.js
+++ b/system/scripts/actors/character-sheet.js
@@ -4,11 +4,11 @@ import { TwentyQuestionsDialog } from "./twenty-questions-dialog.js";
/**
* Actor / Character Sheet
*/
-export class ActorSheetL5r5e extends BaseSheetL5r5e {
+export class CharacterSheetL5r5e extends BaseSheetL5r5e {
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
classes: ["l5r5e", "sheet", "actor"],
- template: CONFIG.l5r5e.paths.templates + "sheets/actor-sheet.html",
+ template: CONFIG.l5r5e.paths.templates + "actors/character-sheet.html",
width: 600,
height: 800,
tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }],
@@ -56,7 +56,7 @@ export class ActorSheetL5r5e extends BaseSheetL5r5e {
*/
getXpSpentInThisRank() {
const currentRank = this.actor.data.data.identity.school_rank || 0;
- const spent = this.actor.items.reduce((tot, item) => {
+ return this.actor.items.reduce((tot, item) => {
// TODO c'est bien par rang actuel +1 ?
if (currentRank + 1 === item.data.data.rank) {
let xp = item.data.data.xp_used || 0;
@@ -69,6 +69,5 @@ export class ActorSheetL5r5e extends BaseSheetL5r5e {
}
return tot;
}, 0);
- return spent;
}
}
diff --git a/system/scripts/sheets/npc-sheet.js b/system/scripts/actors/npc-sheet.js
similarity index 91%
rename from system/scripts/sheets/npc-sheet.js
rename to system/scripts/actors/npc-sheet.js
index d6550ac..2d4518b 100644
--- a/system/scripts/sheets/npc-sheet.js
+++ b/system/scripts/actors/npc-sheet.js
@@ -9,7 +9,7 @@ export class NpcSheetL5r5e extends BaseSheetL5r5e {
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
classes: ["l5r5e", "sheet", "npc"],
- template: CONFIG.l5r5e.paths.templates + "sheets/npc-sheet.html",
+ template: CONFIG.l5r5e.paths.templates + "actors/npc-sheet.html",
width: 600,
height: 800,
tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }],
diff --git a/system/scripts/sheets/twenty-questions-dialog.js b/system/scripts/actors/twenty-questions-dialog.js
similarity index 98%
rename from system/scripts/sheets/twenty-questions-dialog.js
rename to system/scripts/actors/twenty-questions-dialog.js
index fb33ac1..24bf0c1 100644
--- a/system/scripts/sheets/twenty-questions-dialog.js
+++ b/system/scripts/actors/twenty-questions-dialog.js
@@ -1,4 +1,4 @@
-import { L5R5E } from "../config-l5r5e.js";
+import { L5R5E } from "../config.js";
/**
* L5R Twenty Questions form
@@ -24,7 +24,7 @@ export class TwentyQuestionsDialog extends FormApplication {
return mergeObject(super.defaultOptions, {
id: "l5r5e-twenty-questions-dialog",
classes: ["l5r5e", "twenty-questions-dialog"],
- template: CONFIG.l5r5e.paths.templates + "sheets/twenty-questions-dialog.html",
+ template: CONFIG.l5r5e.paths.templates + "actors/twenty-questions-dialog.html",
title: game.i18n.localize("l5r5e.twenty_questions.title"),
width: 600,
height: 600,
diff --git a/system/scripts/config-l5r5e.js b/system/scripts/config.js
similarity index 100%
rename from system/scripts/config-l5r5e.js
rename to system/scripts/config.js
diff --git a/system/scripts/dice-l5r5e.js b/system/scripts/dice-l5r5e.js
deleted file mode 100644
index 6ccf799..0000000
--- a/system/scripts/dice-l5r5e.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Establish each L5r5e dice type here as extensions of DiceTerm.
- * @extends {DiceTerm}
- */
-
-export { L5rBaseDie } from "./dice/dietype/l5r-base-die.js";
-export { AbilityDie } from "./dice/dietype/ability-die.js";
-export { RingDie } from "./dice/dietype/ring-die.js";
-
-/**
- * New extension of the core DicePool class for evaluating rolls with the L5r5e DiceTerms
- */
-export { RollL5r5e } from "./dice/roll.js";
-
-/**
- * Dice pool utility specializing in the L5r5e special dice
- */
-export { DicePoolL5r5e } from "./dice/pool.js";
-
-/**
- * Dice Picker Dialog
- */
-export { DicePickerDialog } from "./dice/dice-picker-dialog.js";
diff --git a/system/scripts/dice/dice-picker-dialog.js b/system/scripts/dice/dice-picker-dialog.js
index e98246c..e4eface 100644
--- a/system/scripts/dice/dice-picker-dialog.js
+++ b/system/scripts/dice/dice-picker-dialog.js
@@ -2,7 +2,7 @@
* L5R Dice picker dialog
* @extends {FormApplication}
*/
-import { L5R5E } from "../config-l5r5e.js";
+import { L5R5E } from "../config.js";
import { RollL5r5e } from "./roll.js";
export class DicePickerDialog extends FormApplication {
diff --git a/system/scripts/dice/roll.js b/system/scripts/dice/roll.js
index 3b2fce4..f502302 100644
--- a/system/scripts/dice/roll.js
+++ b/system/scripts/dice/roll.js
@@ -1,4 +1,4 @@
-import { L5R5E } from "../config-l5r5e.js";
+import { L5R5E } from "../config.js";
import { L5rBaseDie } from "./dietype/l5r-base-die.js";
/**
diff --git a/system/scripts/helpers-l5r5e.js b/system/scripts/helpers.js
similarity index 86%
rename from system/scripts/helpers-l5r5e.js
rename to system/scripts/helpers.js
index 22d0945..65f5709 100644
--- a/system/scripts/helpers-l5r5e.js
+++ b/system/scripts/helpers.js
@@ -1,4 +1,4 @@
-import { L5R5E } from "./config-l5r5e.js";
+import { L5R5E } from "./config.js";
/**
* Extends the actor to process special things from L5R.
@@ -8,7 +8,7 @@ export class HelpersL5r5e {
* Get Rings/Element for List / Select
*/
static getRingsList() {
- return L5R5E.stances.map((e) => {
+ return CONFIG.l5r5e.stances.map((e) => {
return {
id: e,
label: game.i18n.localize(`l5r5e.rings.${e}`),
@@ -31,7 +31,7 @@ export class HelpersL5r5e {
}
const skills = {};
- Array.from(L5R5E.skills).forEach(([id, cat]) => {
+ Array.from(CONFIG.l5r5e.skills).forEach(([id, cat]) => {
if (!skills[cat]) {
skills[cat] = [];
}
@@ -48,7 +48,7 @@ export class HelpersL5r5e {
* Get Techniques for List / Select
*/
static getTechniquesList() {
- return L5R5E.techniques.map((e) => {
+ return CONFIG.l5r5e.techniques.map((e) => {
return {
id: e,
label: game.i18n.localize(`l5r5e.techniques.${e}`),
diff --git a/system/scripts/items/advancement-sheet.js b/system/scripts/items/advancement-sheet.js
index e6d6d45..82fff09 100644
--- a/system/scripts/items/advancement-sheet.js
+++ b/system/scripts/items/advancement-sheet.js
@@ -13,7 +13,7 @@ export class AdvancementSheetL5r5e extends ItemSheetL5r5e {
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
classes: ["l5r5e", "sheet", "advancement"],
- template: CONFIG.l5r5e.paths.templates + "item/advancement-sheet.html",
+ template: CONFIG.l5r5e.paths.templates + "items/advancement/advancement-sheet.html",
width: 520,
height: 480,
tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }],
diff --git a/system/scripts/items/armor-sheet.js b/system/scripts/items/armor-sheet.js
index c632f6b..2f6ca9c 100644
--- a/system/scripts/items/armor-sheet.js
+++ b/system/scripts/items/armor-sheet.js
@@ -8,7 +8,7 @@ export class ArmorSheetL5r5e extends ItemSheetL5r5e {
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
classes: ["l5r5e", "sheet", "armor"],
- template: CONFIG.l5r5e.paths.templates + "item/armor-sheet.html",
+ template: CONFIG.l5r5e.paths.templates + "items/armor/armor-sheet.html",
width: 520,
height: 480,
tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }],
diff --git a/system/scripts/items/item-sheet.js b/system/scripts/items/item-sheet.js
index 2bcd552..206dcb9 100644
--- a/system/scripts/items/item-sheet.js
+++ b/system/scripts/items/item-sheet.js
@@ -7,7 +7,7 @@ export class ItemSheetL5r5e extends ItemSheet {
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
classes: ["l5r5e", "sheet", "item"],
- template: CONFIG.l5r5e.paths.templates + "item/item-sheet.html",
+ template: CONFIG.l5r5e.paths.templates + "items/item/item-sheet.html",
width: 520,
height: 480,
tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }],
diff --git a/system/scripts/items/peculiarity-sheet.js b/system/scripts/items/peculiarity-sheet.js
index 8bb631c..c009380 100644
--- a/system/scripts/items/peculiarity-sheet.js
+++ b/system/scripts/items/peculiarity-sheet.js
@@ -14,7 +14,7 @@ export class PeculiaritySheetL5r5e extends ItemSheetL5r5e {
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
classes: ["l5r5e", "sheet", "peculiarity"],
- template: CONFIG.l5r5e.paths.templates + "item/peculiarity-sheet.html",
+ template: CONFIG.l5r5e.paths.templates + "items/peculiarity/peculiarity-sheet.html",
width: 520,
height: 480,
tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }],
diff --git a/system/scripts/items/quality-sheet.js b/system/scripts/items/property-sheet.js
similarity index 69%
rename from system/scripts/items/quality-sheet.js
rename to system/scripts/items/property-sheet.js
index 4680c74..783a76a 100644
--- a/system/scripts/items/quality-sheet.js
+++ b/system/scripts/items/property-sheet.js
@@ -3,12 +3,12 @@ import { ItemSheetL5r5e } from "./item-sheet.js";
/**
* @extends {ItemSheet}
*/
-export class QualitySheetL5r5e extends ItemSheetL5r5e {
+export class PropertySheetL5r5e extends ItemSheetL5r5e {
/** @override */
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
- classes: ["l5r5e", "sheet", "quality"],
- template: CONFIG.l5r5e.paths.templates + "item/quality-sheet.html",
+ classes: ["l5r5e", "sheet", "property"],
+ template: CONFIG.l5r5e.paths.templates + "items/property/property-sheet.html",
width: 520,
height: 480,
tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }],
diff --git a/system/scripts/items/technique-sheet.js b/system/scripts/items/technique-sheet.js
index 612412b..474e4d1 100644
--- a/system/scripts/items/technique-sheet.js
+++ b/system/scripts/items/technique-sheet.js
@@ -8,7 +8,7 @@ export class TechniqueSheetL5r5e extends ItemSheetL5r5e {
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
classes: ["l5r5e", "sheet", "technique"],
- template: CONFIG.l5r5e.paths.templates + "item/technique-sheet.html",
+ template: CONFIG.l5r5e.paths.templates + "items/technique/technique-sheet.html",
width: 520,
height: 480,
tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }],
diff --git a/system/scripts/items/weapon-sheet.js b/system/scripts/items/weapon-sheet.js
index 04d3bdb..2c33165 100644
--- a/system/scripts/items/weapon-sheet.js
+++ b/system/scripts/items/weapon-sheet.js
@@ -1,4 +1,4 @@
-import { L5R5E } from "../config-l5r5e.js";
+import { L5R5E } from "../config.js";
import { ItemSheetL5r5e } from "./item-sheet.js";
/**
@@ -9,7 +9,7 @@ export class WeaponSheetL5r5e extends ItemSheetL5r5e {
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
classes: ["l5r5e", "sheet", "weapon"],
- template: CONFIG.l5r5e.paths.templates + "item/weapon-sheet.html",
+ template: CONFIG.l5r5e.paths.templates + "items/weapon/weapon-sheet.html",
width: 520,
height: 480,
tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }],
diff --git a/system/scripts/main-l5r5e.js b/system/scripts/main-l5r5e.js
index 9ebfe4a..dd68f10 100644
--- a/system/scripts/main-l5r5e.js
+++ b/system/scripts/main-l5r5e.js
@@ -1,23 +1,27 @@
-// Import Modules
-import { L5R5E } from "./config-l5r5e.js";
-import { HelpersL5r5e } from "./helpers-l5r5e.js";
+// Import Commons Modules
+import { L5R5E } from "./config.js";
+import { HelpersL5r5e } from "./helpers.js";
import { RegisterSettings } from "./settings.js";
import { PreloadTemplates } from "./preloadTemplates.js";
-import { ActorL5r5e } from "./actor-l5r5e.js";
-import { ActorSheetL5r5e } from "./sheets/actor-sheet.js";
-import { NpcSheetL5r5e } from "./sheets/npc-sheet.js";
-import { RollL5r5e, AbilityDie, RingDie, DicePickerDialog } from "./dice-l5r5e.js";
+// Actors
+import { ActorL5r5e } from "./actor.js";
+import { CharacterSheetL5r5e } from "./actors/character-sheet.js";
+import { NpcSheetL5r5e } from "./actors/npc-sheet.js";
+// Dice and rolls
+import { AbilityDie } from "./dice/dietype/ability-die.js";
+import { RingDie } from "./dice/dietype/ring-die.js";
+import { RollL5r5e } from "./dice/roll.js";
+import { DicePickerDialog } from "./dice/dice-picker-dialog.js";
+// Items
import { ItemL5r5e } from "./items/item.js";
import { ItemSheetL5r5e } from "./items/item-sheet.js";
import { ArmorSheetL5r5e } from "./items/armor-sheet.js";
import { WeaponSheetL5r5e } from "./items/weapon-sheet.js";
import { TechniqueSheetL5r5e } from "./items/technique-sheet.js";
-import { QualitySheetL5r5e } from "./items/quality-sheet.js";
+import { PropertySheetL5r5e } from "./items/property-sheet.js";
import { AdvancementSheetL5r5e } from "./items/advancement-sheet.js";
import { PeculiaritySheetL5r5e } from "./items/peculiarity-sheet.js";
-// Import Dice Types
-
/* ------------------------------------ */
/* Initialize system */
/* ------------------------------------ */
@@ -37,7 +41,7 @@ Hooks.once("init", async function () {
// Assign custom classes and constants here
CONFIG.Actor.entityClass = ActorL5r5e;
- CONFIG.Actor.sheetClasses = ActorSheetL5r5e;
+ CONFIG.Actor.sheetClasses = CharacterSheetL5r5e;
CONFIG.Item.entityClass = ItemL5r5e;
// Define custom Roll class
@@ -63,7 +67,7 @@ Hooks.once("init", async function () {
// Register custom sheets (if any)
// Actors sheet
Actors.unregisterSheet("core", ActorSheet);
- Actors.registerSheet("l5r5e", ActorSheetL5r5e, { types: ["character"], makeDefault: true });
+ Actors.registerSheet("l5r5e", CharacterSheetL5r5e, { types: ["character"], makeDefault: true });
Actors.registerSheet("l5r5e", NpcSheetL5r5e, { types: ["npc"], makeDefault: false });
// Items sheet
@@ -72,7 +76,7 @@ Hooks.once("init", async function () {
Items.registerSheet("l5r5e", ArmorSheetL5r5e, { types: ["armor"], makeDefault: true });
Items.registerSheet("l5r5e", WeaponSheetL5r5e, { types: ["weapon"], makeDefault: true });
Items.registerSheet("l5r5e", TechniqueSheetL5r5e, { types: ["technique"], makeDefault: true });
- Items.registerSheet("l5r5e", QualitySheetL5r5e, { types: ["quality"], makeDefault: true });
+ Items.registerSheet("l5r5e", PropertySheetL5r5e, { types: ["property"], makeDefault: true });
Items.registerSheet("l5r5e", PeculiaritySheetL5r5e, { types: ["peculiarity"], makeDefault: true });
Items.registerSheet("l5r5e", AdvancementSheetL5r5e, { types: ["advancement"], makeDefault: true });
diff --git a/system/scripts/preloadTemplates.js b/system/scripts/preloadTemplates.js
index 92ea930..0834ad7 100644
--- a/system/scripts/preloadTemplates.js
+++ b/system/scripts/preloadTemplates.js
@@ -1,46 +1,48 @@
export const PreloadTemplates = async function () {
const templatePaths = [
// Add paths to "systems/l5r5e/templates"
- // actor
- "systems/l5r5e/templates/sheets/actor/rings.html",
- "systems/l5r5e/templates/sheets/actor/narrative.html",
- "systems/l5r5e/templates/sheets/actor/identity.html",
- "systems/l5r5e/templates/sheets/actor/category.html",
- "systems/l5r5e/templates/sheets/actor/skill.html",
- "systems/l5r5e/templates/sheets/actor/social.html",
- "systems/l5r5e/templates/sheets/actor/attributes.html",
- "systems/l5r5e/templates/sheets/actor/conflict.html",
- "systems/l5r5e/templates/sheets/actor/stance.html",
- "systems/l5r5e/templates/sheets/actor/techniques.html",
- "systems/l5r5e/templates/sheets/actor/experience.html",
- "systems/l5r5e/templates/sheets/actor/advancement.html",
+ // actors
+ "systems/l5r5e/templates/actors/character/rings.html",
+ "systems/l5r5e/templates/actors/character/narrative.html",
+ "systems/l5r5e/templates/actors/character/identity.html",
+ "systems/l5r5e/templates/actors/character/category.html",
+ "systems/l5r5e/templates/actors/character/skill.html",
+ "systems/l5r5e/templates/actors/character/social.html",
+ "systems/l5r5e/templates/actors/character/attributes.html",
+ "systems/l5r5e/templates/actors/character/conflict.html",
+ "systems/l5r5e/templates/actors/character/stance.html",
+ "systems/l5r5e/templates/actors/character/techniques.html",
+ "systems/l5r5e/templates/actors/character/experience.html",
+ "systems/l5r5e/templates/actors/character/advancement.html",
// npc
- "systems/l5r5e/templates/sheets/npc/identity.html",
- "systems/l5r5e/templates/sheets/npc/narrative.html",
- "systems/l5r5e/templates/sheets/npc/social.html",
- "systems/l5r5e/templates/sheets/npc/rings.html",
- "systems/l5r5e/templates/sheets/npc/attributes.html",
- "systems/l5r5e/templates/sheets/npc/skill.html",
- "systems/l5r5e/templates/sheets/npc/techniques.html",
+ "systems/l5r5e/templates/actors/npc/identity.html",
+ "systems/l5r5e/templates/actors/npc/narrative.html",
+ "systems/l5r5e/templates/actors/npc/social.html",
+ "systems/l5r5e/templates/actors/npc/rings.html",
+ "systems/l5r5e/templates/actors/npc/attributes.html",
+ "systems/l5r5e/templates/actors/npc/skill.html",
+ "systems/l5r5e/templates/actors/npc/techniques.html",
// items
- "systems/l5r5e/templates/item/weapon-sheet.html",
- "systems/l5r5e/templates/item/items.html",
- "systems/l5r5e/templates/item/item-entry.html",
- "systems/l5r5e/templates/item/weapons.html",
- "systems/l5r5e/templates/item/weapon-entry.html",
- "systems/l5r5e/templates/item/armors.html",
- "systems/l5r5e/templates/item/armor-entry.html",
- "systems/l5r5e/templates/item/technique-sheet.html",
- "systems/l5r5e/templates/item/technique-entry.html",
- "systems/l5r5e/templates/item/qualities.html",
- "systems/l5r5e/templates/item/quality-sheet.html",
- "systems/l5r5e/templates/item/quality-entry.html",
- "systems/l5r5e/templates/item/advancements.html",
- "systems/l5r5e/templates/item/advancement-sheet.html",
- "systems/l5r5e/templates/item/advancement-entry.html",
- "systems/l5r5e/templates/item/peculiarities.html",
- "systems/l5r5e/templates/item/peculiarity-sheet.html",
- "systems/l5r5e/templates/item/peculiarity-entry.html",
+ "systems/l5r5e/templates/items/advancement/advancements.html",
+ "systems/l5r5e/templates/items/advancement/advancement-entry.html",
+ "systems/l5r5e/templates/items/advancement/advancement-sheet.html",
+ "systems/l5r5e/templates/items/armor/armors.html",
+ "systems/l5r5e/templates/items/armor/armor-entry.html",
+ "systems/l5r5e/templates/items/armor/armor-sheet.html",
+ "systems/l5r5e/templates/items/item/items.html",
+ "systems/l5r5e/templates/items/item/item-entry.html",
+ "systems/l5r5e/templates/items/item/item-sheet.html",
+ "systems/l5r5e/templates/items/peculiarity/peculiarities.html",
+ "systems/l5r5e/templates/items/peculiarity/peculiarity-entry.html",
+ "systems/l5r5e/templates/items/peculiarity/peculiarity-sheet.html",
+ "systems/l5r5e/templates/items/property/properties.html",
+ "systems/l5r5e/templates/items/property/property-entry.html",
+ "systems/l5r5e/templates/items/property/property-sheet.html",
+ "systems/l5r5e/templates/items/technique/technique-entry.html",
+ "systems/l5r5e/templates/items/technique/technique-sheet.html",
+ "systems/l5r5e/templates/items/weapon/weapons.html",
+ "systems/l5r5e/templates/items/weapon/weapon-entry.html",
+ "systems/l5r5e/templates/items/weapon/weapon-sheet.html",
];
return loadTemplates(templatePaths);
diff --git a/system/template.json b/system/template.json
index 38b4d43..a4aa5e1 100644
--- a/system/template.json
+++ b/system/template.json
@@ -134,7 +134,7 @@
}
},
"Item": {
- "types": ["item", "armor", "weapon", "technique", "quality", "peculiarity", "advancement"],
+ "types": ["item", "armor", "weapon", "technique", "property", "peculiarity", "advancement"],
"templates": {
"advancement": {
"in_curriculum": false,
@@ -181,7 +181,7 @@
"effects": "",
"description": ""
},
- "quality": {
+ "property": {
"description": ""
},
"peculiarity": {
diff --git a/system/templates/sheets/actor-sheet.html b/system/templates/actors/character-sheet.html
similarity index 67%
rename from system/templates/sheets/actor-sheet.html
rename to system/templates/actors/character-sheet.html
index acdcba1..27d9474 100644
--- a/system/templates/sheets/actor-sheet.html
+++ b/system/templates/actors/character-sheet.html
@@ -4,13 +4,13 @@
{{!-- Sheet Body --}}
@@ -28,31 +28,31 @@
{{#each data.skills as |category id|}}
- {{> 'systems/l5r5e/templates/sheets/actor/category.html' category=category categoryId=id}}
+ {{> 'systems/l5r5e/templates/actors/character/category.html' category=category categoryId=id}}
{{/each}}
- {{> 'systems/l5r5e/templates/sheets/actor/techniques.html' }}
+ {{> 'systems/l5r5e/templates/actors/character/techniques.html' }}
{{!-- Narrative Tab --}}
- {{> 'systems/l5r5e/templates/sheets/actor/narrative.html' }}
+ {{> 'systems/l5r5e/templates/actors/character/narrative.html' }}
{{!-- Conflict Tab --}}
- {{> 'systems/l5r5e/templates/sheets/actor/conflict.html' }}
- {{> 'systems/l5r5e/templates/item/weapons.html' }}
- {{> 'systems/l5r5e/templates/item/armors.html' }}
+ {{> 'systems/l5r5e/templates/actors/character/conflict.html' }}
+ {{> 'systems/l5r5e/templates/items/weapon/weapons.html' }}
+ {{> 'systems/l5r5e/templates/items/armor/armors.html' }}
- {{> 'systems/l5r5e/templates/item/items.html' }}
+ {{> 'systems/l5r5e/templates/items/item/items.html' }}
{{!-- Experience Tab --}}
- {{> 'systems/l5r5e/templates/sheets/actor/experience.html' }}
+ {{> 'systems/l5r5e/templates/actors/character/experience.html' }}
\ No newline at end of file
diff --git a/system/templates/sheets/actor/advancement.html b/system/templates/actors/character/advancement.html
similarity index 100%
rename from system/templates/sheets/actor/advancement.html
rename to system/templates/actors/character/advancement.html
diff --git a/system/templates/sheets/actor/attributes.html b/system/templates/actors/character/attributes.html
similarity index 100%
rename from system/templates/sheets/actor/attributes.html
rename to system/templates/actors/character/attributes.html
diff --git a/system/templates/sheets/actor/category.html b/system/templates/actors/character/category.html
similarity index 86%
rename from system/templates/sheets/actor/category.html
rename to system/templates/actors/character/category.html
index eba44f7..a98dad1 100644
--- a/system/templates/sheets/actor/category.html
+++ b/system/templates/actors/character/category.html
@@ -2,7 +2,7 @@
{{#each category as |skill id| }}
- {{> 'systems/l5r5e/templates/sheets/actor/skill.html' categoryId=../categoryId skill=skill skillId=id }}
+ {{> 'systems/l5r5e/templates/actors/character/skill.html' categoryId=../categoryId skill=skill skillId=id }}
{{/each}}
diff --git a/system/templates/sheets/actor/conflict.html b/system/templates/actors/character/conflict.html
similarity index 67%
rename from system/templates/sheets/actor/conflict.html
rename to system/templates/actors/character/conflict.html
index 232c8cc..6277a46 100644
--- a/system/templates/sheets/actor/conflict.html
+++ b/system/templates/actors/character/conflict.html
@@ -2,7 +2,7 @@
{{#each data.rings as |ringValue ringId|}}
- {{> 'systems/l5r5e/templates/sheets/actor/stance.html' stance=../data.stance ringId=ringId }}
+ {{> 'systems/l5r5e/templates/actors/character/stance.html' stance=../data.stance ringId=ringId }}
{{/each}}
diff --git a/system/templates/sheets/actor/experience.html b/system/templates/actors/character/experience.html
similarity index 94%
rename from system/templates/sheets/actor/experience.html
rename to system/templates/actors/character/experience.html
index 9e8d292..c8ed34a 100644
--- a/system/templates/sheets/actor/experience.html
+++ b/system/templates/actors/character/experience.html
@@ -33,7 +33,7 @@
{{#each actor.items as |advancement advancementId|}}
{{#ifCond '["peculiarity", "technique","advancement"]' 'includes' advancement.type}}
- {{> 'systems/l5r5e/templates/sheets/actor/advancement.html' advancement=advancement }}
+ {{> 'systems/l5r5e/templates/actors/character/advancement.html' advancement=advancement }}
{{/ifCond}}
{{/each}}
diff --git a/system/templates/sheets/actor/identity.html b/system/templates/actors/character/identity.html
similarity index 100%
rename from system/templates/sheets/actor/identity.html
rename to system/templates/actors/character/identity.html
diff --git a/system/templates/sheets/actor/narrative.html b/system/templates/actors/character/narrative.html
similarity index 88%
rename from system/templates/sheets/actor/narrative.html
rename to system/templates/actors/character/narrative.html
index 81cc6b1..4c44224 100644
--- a/system/templates/sheets/actor/narrative.html
+++ b/system/templates/actors/character/narrative.html
@@ -17,7 +17,7 @@
{{#each actor.item as |item id|}}
{{#ifCond item.type '==' 'advantage'}}
- {{> 'systems/l5r5e/templates/item/item-entry.html' item=item id=id }}
+ {{> 'systems/l5r5e/templates/items/item/item-entry.html' item=item id=id }}
{{/ifCond}}
{{/each}}
@@ -29,7 +29,7 @@
{{#each actor.item as |item id|}}
{{#ifCond item.type '==' 'disadvantage'}}
- {{> 'systems/l5r5e/templates/item/item-entry.html' item=item id=id }}
+ {{> 'systems/l5r5e/templates/items/item/item-entry.html' item=item id=id }}
{{/ifCond}}
{{/each}}
diff --git a/system/templates/sheets/actor/rings.html b/system/templates/actors/character/rings.html
similarity index 100%
rename from system/templates/sheets/actor/rings.html
rename to system/templates/actors/character/rings.html
diff --git a/system/templates/sheets/actor/skill.html b/system/templates/actors/character/skill.html
similarity index 100%
rename from system/templates/sheets/actor/skill.html
rename to system/templates/actors/character/skill.html
diff --git a/system/templates/sheets/actor/social.html b/system/templates/actors/character/social.html
similarity index 100%
rename from system/templates/sheets/actor/social.html
rename to system/templates/actors/character/social.html
diff --git a/system/templates/sheets/actor/stance.html b/system/templates/actors/character/stance.html
similarity index 100%
rename from system/templates/sheets/actor/stance.html
rename to system/templates/actors/character/stance.html
diff --git a/system/templates/sheets/actor/techniques.html b/system/templates/actors/character/techniques.html
similarity index 82%
rename from system/templates/sheets/actor/techniques.html
rename to system/templates/actors/character/techniques.html
index a634e97..1f20f9e 100644
--- a/system/templates/sheets/actor/techniques.html
+++ b/system/templates/actors/character/techniques.html
@@ -7,7 +7,7 @@
{{#each actor.items as |item id|}}
{{#ifCond item.type '==' 'technique'}}
- {{> 'systems/l5r5e/templates/item/technique-entry.html' technique=item }}
+ {{> 'systems/l5r5e/templates/items/technique/technique-entry.html' technique=item }}
{{/ifCond}}
{{/each}}
diff --git a/system/templates/sheets/npc-sheet.html b/system/templates/actors/npc-sheet.html
similarity index 60%
rename from system/templates/sheets/npc-sheet.html
rename to system/templates/actors/npc-sheet.html
index 9cf55a1..db708a6 100644
--- a/system/templates/sheets/npc-sheet.html
+++ b/system/templates/actors/npc-sheet.html
@@ -4,35 +4,35 @@
{{ editor content=data.notes.value target="data.notes.value" button=true editable=editable }}
{{!-- Sheet Body --}}
- {{> 'systems/l5r5e/templates/sheets/npc/skill.html' }}
+ {{> 'systems/l5r5e/templates/actors/npc/skill.html' }}
- {{> 'systems/l5r5e/templates/sheets/npc/techniques.html' }}
+ {{> 'systems/l5r5e/templates/actors/npc/techniques.html' }}
- {{> 'systems/l5r5e/templates/sheets/npc/narrative.html' }}
+ {{> 'systems/l5r5e/templates/actors/npc/narrative.html' }}
- {{> 'systems/l5r5e/templates/item/items.html' }}
+ {{> 'systems/l5r5e/templates/items/item/items.html' }}
- {{> 'systems/l5r5e/templates/item/weapons.html' }}
+ {{> 'systems/l5r5e/templates/items/weapon/weapons.html' }}
- {{> 'systems/l5r5e/templates/item/armors.html' }}
+ {{> 'systems/l5r5e/templates/items/armor/armors.html' }}
\ No newline at end of file
diff --git a/system/templates/sheets/npc/attributes.html b/system/templates/actors/npc/attributes.html
similarity index 100%
rename from system/templates/sheets/npc/attributes.html
rename to system/templates/actors/npc/attributes.html
diff --git a/system/templates/sheets/npc/conflict.html b/system/templates/actors/npc/conflict.html
similarity index 67%
rename from system/templates/sheets/npc/conflict.html
rename to system/templates/actors/npc/conflict.html
index 232c8cc..6277a46 100644
--- a/system/templates/sheets/npc/conflict.html
+++ b/system/templates/actors/npc/conflict.html
@@ -2,7 +2,7 @@
{{#each data.rings as |ringValue ringId|}}
- {{> 'systems/l5r5e/templates/sheets/actor/stance.html' stance=../data.stance ringId=ringId }}
+ {{> 'systems/l5r5e/templates/actors/character/stance.html' stance=../data.stance ringId=ringId }}
{{/each}}
diff --git a/system/templates/sheets/npc/identity.html b/system/templates/actors/npc/identity.html
similarity index 100%
rename from system/templates/sheets/npc/identity.html
rename to system/templates/actors/npc/identity.html
diff --git a/system/templates/sheets/npc/narrative.html b/system/templates/actors/npc/narrative.html
similarity index 75%
rename from system/templates/sheets/npc/narrative.html
rename to system/templates/actors/npc/narrative.html
index fb9b5c4..7fbffe7 100644
--- a/system/templates/sheets/npc/narrative.html
+++ b/system/templates/actors/npc/narrative.html
@@ -3,7 +3,7 @@
{{#each actor.item as |item id|}}
{{#ifCond item.type '==' 'advantage'}}
- {{> 'systems/l5r5e/templates/item/item-entry.html' item=item id=id }}
+ {{> 'systems/l5r5e/templates/items/item/item-entry.html' item=item id=id }}
{{/ifCond}}
{{/each}}
@@ -13,7 +13,7 @@
{{#each actor.item as |item id|}}
{{#ifCond item.type '==' 'disadvantage'}}
- {{> 'systems/l5r5e/templates/item/item-entry.html' item=item id=id }}
+ {{> 'systems/l5r5e/templates/items/item/item-entry.html' item=item id=id }}
{{/ifCond}}
{{/each}}
diff --git a/system/templates/sheets/npc/rings.html b/system/templates/actors/npc/rings.html
similarity index 100%
rename from system/templates/sheets/npc/rings.html
rename to system/templates/actors/npc/rings.html
diff --git a/system/templates/sheets/npc/skill.html b/system/templates/actors/npc/skill.html
similarity index 100%
rename from system/templates/sheets/npc/skill.html
rename to system/templates/actors/npc/skill.html
diff --git a/system/templates/sheets/npc/social.html b/system/templates/actors/npc/social.html
similarity index 100%
rename from system/templates/sheets/npc/social.html
rename to system/templates/actors/npc/social.html
diff --git a/system/templates/sheets/npc/stance.html b/system/templates/actors/npc/stance.html
similarity index 100%
rename from system/templates/sheets/npc/stance.html
rename to system/templates/actors/npc/stance.html
diff --git a/system/templates/sheets/npc/techniques.html b/system/templates/actors/npc/techniques.html
similarity index 82%
rename from system/templates/sheets/npc/techniques.html
rename to system/templates/actors/npc/techniques.html
index a634e97..1f20f9e 100644
--- a/system/templates/sheets/npc/techniques.html
+++ b/system/templates/actors/npc/techniques.html
@@ -7,7 +7,7 @@
{{#each actor.items as |item id|}}
{{#ifCond item.type '==' 'technique'}}
- {{> 'systems/l5r5e/templates/item/technique-entry.html' technique=item }}
+ {{> 'systems/l5r5e/templates/items/technique/technique-entry.html' technique=item }}
{{/ifCond}}
{{/each}}
diff --git a/system/templates/sheets/twenty-questions-dialog.html b/system/templates/actors/twenty-questions-dialog.html
similarity index 100%
rename from system/templates/sheets/twenty-questions-dialog.html
rename to system/templates/actors/twenty-questions-dialog.html
diff --git a/system/templates/item/qualities.html b/system/templates/item/qualities.html
deleted file mode 100644
index aa453c4..0000000
--- a/system/templates/item/qualities.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
- {{#each actor.items as |item id|}}
- {{#ifCond item.type '==' 'quality'}}
- {{> 'systems/l5r5e/templates/item/quality-entry.html' item=item id=id }}
- {{/ifCond}}
- {{/each}}
-
-
\ No newline at end of file
diff --git a/system/templates/item/advancement-entry.html b/system/templates/items/advancement/advancement-entry.html
similarity index 100%
rename from system/templates/item/advancement-entry.html
rename to system/templates/items/advancement/advancement-entry.html
diff --git a/system/templates/item/advancement-sheet.html b/system/templates/items/advancement/advancement-sheet.html
similarity index 100%
rename from system/templates/item/advancement-sheet.html
rename to system/templates/items/advancement/advancement-sheet.html
diff --git a/system/templates/item/advancements.html b/system/templates/items/advancement/advancements.html
similarity index 70%
rename from system/templates/item/advancements.html
rename to system/templates/items/advancement/advancements.html
index 5dc9f97..f9577b6 100644
--- a/system/templates/item/advancements.html
+++ b/system/templates/items/advancement/advancements.html
@@ -3,7 +3,7 @@
{{#each actor.items as |item id|}}
{{#ifCond item.type '==' 'advancement'}}
- {{> 'systems/l5r5e/templates/item/advancement-entry.html' advancement=item id=id }}
+ {{> 'systems/l5r5e/templates/items/advancement/advancement-entry.html' advancement=item id=id }}
{{/ifCond}}
{{/each}}
diff --git a/system/templates/item/armor-entry.html b/system/templates/items/armor/armor-entry.html
similarity index 100%
rename from system/templates/item/armor-entry.html
rename to system/templates/items/armor/armor-entry.html
diff --git a/system/templates/item/armor-sheet.html b/system/templates/items/armor/armor-sheet.html
similarity index 98%
rename from system/templates/item/armor-sheet.html
rename to system/templates/items/armor/armor-sheet.html
index 9edf095..4258fa9 100644
--- a/system/templates/item/armor-sheet.html
+++ b/system/templates/items/armor/armor-sheet.html
@@ -56,7 +56,7 @@
-
+
diff --git a/system/templates/item/armors.html b/system/templates/items/armor/armors.html
similarity index 72%
rename from system/templates/item/armors.html
rename to system/templates/items/armor/armors.html
index 3ac19d4..c276d78 100644
--- a/system/templates/item/armors.html
+++ b/system/templates/items/armor/armors.html
@@ -3,7 +3,7 @@
{{#each actor.items as |item id|}}
{{#ifCond item.type '==' 'armor'}}
- {{> 'systems/l5r5e/templates/item/armor-entry.html' item=item id=id }}
+ {{> 'systems/l5r5e/templates/items/armor/armor-entry.html' item=item id=id }}
{{/ifCond}}
{{/each}}
diff --git a/system/templates/item/item-entry.html b/system/templates/items/item/item-entry.html
similarity index 100%
rename from system/templates/item/item-entry.html
rename to system/templates/items/item/item-entry.html
diff --git a/system/templates/item/item-sheet.html b/system/templates/items/item/item-sheet.html
similarity index 98%
rename from system/templates/item/item-sheet.html
rename to system/templates/items/item/item-sheet.html
index 5e650a9..3a5f90e 100644
--- a/system/templates/item/item-sheet.html
+++ b/system/templates/items/item/item-sheet.html
@@ -51,7 +51,7 @@
-
+
diff --git a/system/templates/item/items.html b/system/templates/items/item/items.html
similarity index 71%
rename from system/templates/item/items.html
rename to system/templates/items/item/items.html
index 123051b..1ef7fc1 100644
--- a/system/templates/item/items.html
+++ b/system/templates/items/item/items.html
@@ -3,7 +3,7 @@
{{#each actor.items as |item id|}}
{{#ifCond item.type '==' 'item'}}
- {{> 'systems/l5r5e/templates/item/item-entry.html' item=item id=id }}
+ {{> 'systems/l5r5e/templates/items/item/item-entry.html' item=item id=id }}
{{/ifCond}}
{{/each}}
diff --git a/system/templates/item/peculiarities.html b/system/templates/items/peculiarity/peculiarities.html
similarity index 70%
rename from system/templates/item/peculiarities.html
rename to system/templates/items/peculiarity/peculiarities.html
index 5dc9f97..f9577b6 100644
--- a/system/templates/item/peculiarities.html
+++ b/system/templates/items/peculiarity/peculiarities.html
@@ -3,7 +3,7 @@
{{#each actor.items as |item id|}}
{{#ifCond item.type '==' 'advancement'}}
- {{> 'systems/l5r5e/templates/item/advancement-entry.html' advancement=item id=id }}
+ {{> 'systems/l5r5e/templates/items/advancement/advancement-entry.html' advancement=item id=id }}
{{/ifCond}}
{{/each}}
diff --git a/system/templates/item/peculiarity-entry.html b/system/templates/items/peculiarity/peculiarity-entry.html
similarity index 100%
rename from system/templates/item/peculiarity-entry.html
rename to system/templates/items/peculiarity/peculiarity-entry.html
diff --git a/system/templates/item/peculiarity-sheet.html b/system/templates/items/peculiarity/peculiarity-sheet.html
similarity index 100%
rename from system/templates/item/peculiarity-sheet.html
rename to system/templates/items/peculiarity/peculiarity-sheet.html
diff --git a/system/templates/items/property/properties.html b/system/templates/items/property/properties.html
new file mode 100644
index 0000000..643ac77
--- /dev/null
+++ b/system/templates/items/property/properties.html
@@ -0,0 +1,10 @@
+
+
+
+ {{#each actor.items as |item id|}}
+ {{#ifCond item.type '==' 'property'}}
+ {{> 'systems/l5r5e/templates/items/property/property-entry.html' item=item id=id }}
+ {{/ifCond}}
+ {{/each}}
+
+
\ No newline at end of file
diff --git a/system/templates/item/quality-entry.html b/system/templates/items/property/property-entry.html
similarity index 100%
rename from system/templates/item/quality-entry.html
rename to system/templates/items/property/property-entry.html
diff --git a/system/templates/item/quality-sheet.html b/system/templates/items/property/property-sheet.html
similarity index 100%
rename from system/templates/item/quality-sheet.html
rename to system/templates/items/property/property-sheet.html
diff --git a/system/templates/item/technique-entry.html b/system/templates/items/technique/technique-entry.html
similarity index 100%
rename from system/templates/item/technique-entry.html
rename to system/templates/items/technique/technique-entry.html
diff --git a/system/templates/item/technique-sheet.html b/system/templates/items/technique/technique-sheet.html
similarity index 100%
rename from system/templates/item/technique-sheet.html
rename to system/templates/items/technique/technique-sheet.html
diff --git a/system/templates/item/weapon-entry.html b/system/templates/items/weapon/weapon-entry.html
similarity index 100%
rename from system/templates/item/weapon-entry.html
rename to system/templates/items/weapon/weapon-entry.html
diff --git a/system/templates/item/weapon-sheet.html b/system/templates/items/weapon/weapon-sheet.html
similarity index 99%
rename from system/templates/item/weapon-sheet.html
rename to system/templates/items/weapon/weapon-sheet.html
index d3d8c2e..c741504 100644
--- a/system/templates/item/weapon-sheet.html
+++ b/system/templates/items/weapon/weapon-sheet.html
@@ -76,7 +76,7 @@
-
+
diff --git a/system/templates/item/weapons.html b/system/templates/items/weapon/weapons.html
similarity index 72%
rename from system/templates/item/weapons.html
rename to system/templates/items/weapon/weapons.html
index 9110ca7..5f64116 100644
--- a/system/templates/item/weapons.html
+++ b/system/templates/items/weapon/weapons.html
@@ -3,7 +3,7 @@
{{#each actor.items as |item id|}}
{{#ifCond item.type '==' 'weapon'}}
- {{> 'systems/l5r5e/templates/item/weapon-entry.html' item=item id=id }}
+ {{> 'systems/l5r5e/templates/items/weapon/weapon-entry.html' item=item id=id }}
{{/ifCond}}
{{/each}}