working on some parts of Sheets

This commit is contained in:
Vlyan
2020-12-15 19:30:01 +01:00
parent 971c33321e
commit bee3be183e
28 changed files with 546 additions and 334 deletions

View File

@@ -7,10 +7,38 @@ export class ActorL5r5e extends Actor {
* @override
*/
static async create(data, options = {}) {
if (!Object.keys(data).includes("type")) {
data.type = "character";
}
// if (!Object.keys(data).includes("type")) {
// data.type = "character";
// }
// Some tweak on actors
data.token = data.token || {};
switch (data.type) {
case "character":
mergeObject(
data.token,
{
// vision: true,
// dimSight: 30,
// brightSight: 0,
actorLink: true,
disposition: 1, // friendly
},
{ overwrite: false }
);
break;
case "npc":
mergeObject(
data.token,
{
actorLink: false,
disposition: 0, // neutral
},
{ overwrite: false }
);
break;
}
await super.create(data, options);
}

View File

@@ -0,0 +1,48 @@
import { ItemSheetL5r5e } from "./item-sheet.js";
/**
* @extends {ItemSheet}
*/
export class QualitySheetL5r5e extends ItemSheetL5r5e {
/** @override */
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
classes: ["l5r5e", "sheet", "quality"],
template: CONFIG.L5r5e.paths.templates + "item/quality-sheet.html",
width: 520,
height: 480,
tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }],
});
}
getData() {
const sheetData = super.getData();
sheetData.data.dtypes = ["String", "Number", "Boolean"];
sheetData.data.isQuality = true;
return sheetData;
}
/**
* Subscribe to events from the sheet.
* @param html HTML content of the sheet.
*/
activateListeners(html) {
super.activateListeners(html);
// Everything below here is only needed if the sheet is editable
if (!this.options.editable) {
return;
}
}
/**
* Update item with values from the sheet.
* @param event
* @param formData
*/
_updateObject(event, formData) {
return this.object.update(formData);
}
}

View File

@@ -1,3 +1,4 @@
import { L5R5E } from "../l5r5e-config.js";
import { ItemSheetL5r5e } from "./item-sheet.js";
/**
@@ -21,6 +22,9 @@ export class WeaponSheetL5r5e extends ItemSheetL5r5e {
sheetData.data.isWeapon = true;
sheetData.data.isEquipment = true;
sheetData.data.skills = Array.from(L5R5E.skills)
.filter(([id, cat]) => cat === "martial")
.map(([id, cat]) => id);
return sheetData;
}

View File

@@ -6,6 +6,7 @@ L5R5E.paths = {
};
L5R5E.stances = ["earth", "air", "water", "fire", "void"];
L5R5E.feats = ["kata", "kiho", "invocation", "ritual", "shuji", "maho", "ninjutsu"];
// Map SkillId - CategoryId
L5R5E.skills = new Map();

View File

@@ -11,6 +11,7 @@ import { ItemSheetL5r5e } from "./items/item-sheet.js";
import { ArmorSheetL5r5e } from "./items/armor-sheet.js";
import { WeaponSheetL5r5e } from "./items/weapon-sheet.js";
import { FeatSheetL5r5e } from "./items/feat-sheet.js";
import { QualitySheetL5r5e } from "./items/quality-sheet.js";
// Import Dice Types
@@ -67,6 +68,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", FeatSheetL5r5e, { types: ["feat"], makeDefault: true });
Items.registerSheet("l5r5e", QualitySheetL5r5e, { types: ["quality"], makeDefault: true });
// for debug
Handlebars.registerHelper("json", function (...objects) {
@@ -108,6 +110,10 @@ Hooks.once("init", async function () {
const key = "l5r5e.conflict.stances." + ringName.toLowerCase() + "tip";
return game.i18n.localize(key);
});
Handlebars.registerHelper("localizeFeat", function (featName) {
return game.i18n.localize("l5r5e.feats." + featName.toLowerCase());
});
});
/* ------------------------------------ */

View File

@@ -23,6 +23,9 @@ export const PreloadTemplates = async function () {
"systems/l5r5e/templates/item/armor-entry.html",
"systems/l5r5e/templates/item/feat-sheet.html",
"systems/l5r5e/templates/item/feat-entry.html",
"systems/l5r5e/templates/item/qualities.html",
"systems/l5r5e/templates/item/quality-sheet.html",
"systems/l5r5e/templates/item/quality-entry.html",
];
return loadTemplates(templatePaths);

View File

@@ -1,6 +1,10 @@
import { BaseSheetL5r5e } from "./base-sheet.js";
import { TwentyQuestionsDialog } from "./twenty-questions-dialog.js";
export class ActorSheetL5r5e extends ActorSheet {
/**
* Actor / Character Sheet
*/
export class ActorSheetL5r5e extends BaseSheetL5r5e {
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
classes: ["l5r5e", "sheet", "actor"],
@@ -20,7 +24,7 @@ export class ActorSheetL5r5e extends ActorSheet {
let buttons = super._getHeaderButtons();
buttons.unshift({
label: "20Q", // TODO localization
label: game.i18n.localize("l5r5e.twenty_questions.bt_abrev"),
class: "twenty-questions",
icon: "fas fa-graduation-cap",
onclick: async () => {
@@ -30,139 +34,4 @@ export class ActorSheetL5r5e extends ActorSheet {
return buttons;
}
getData() {
const sheetData = super.getData();
this._prepareItems(sheetData);
const feats = sheetData.items.filter((item) => item.type === "feat");
sheetData.data.feats = feats;
return sheetData;
}
/**
* Update the actor.
* @param event
* @param formData
*/
_updateObject(event, formData) {
return this.object.update(formData);
}
/**
* Prepare item data to be displayed in the actor sheet.
* @param sheetData Data of the actor been displayed in the sheet.
*/
_prepareItems(sheetData) {
for (let item of sheetData.items) {
switch (item.type) {
case "weapon":
item.isWeapon = true;
item.isEquipment = true;
break;
case "armor":
item.isArmor = true;
item.isEquipment = true;
break;
case "feat":
item.isFeat = true;
break;
default:
item.isEquipment = true;
break;
}
}
}
_prepareFeats() {}
/**
* Subscribe to events from the sheet.
* @param html HTML content of the sheet.
*/
activateListeners(html) {
super.activateListeners(html);
// Everything below here is only needed if the sheet is editable
if (!this.options.editable) return;
// Update Inventory Item
html.find(".item-edit").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".item");
const itemId = li.data("itemId");
const item = this.actor.getOwnedItem(itemId);
item.sheet.render(true);
});
// Delete Inventory Item
html.find(".item-delete").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".item");
const itemId = li.data("itemId");
this.actor.deleteOwnedItem(itemId);
});
html.find(".feat-add").on("click", (ev) => {
this._createFeat();
});
html.find(".feat-delete").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".feat");
const featId = li.data("featId");
console.log("Remove feat" + featId + " clicked");
this.actor.deleteOwnedItem(featId);
});
html.find(".feat-edit").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".feat");
const featId = li.data("featId");
const feat = this.actor.getOwnedItem(featId);
feat.sheet.render(true);
});
html.find(".skill-name").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".skill");
const skillId = li.data("skill");
this._onSkillClicked(skillId);
});
html.find(".acquisition-add").on("click", (ev) => {
this._createFeat();
});
}
/**
* Creates a new feat for the character and shows a window to edit it.
*/
async _createFeat() {
const data = {
name: game.i18n.localize("l5r5e.featplaceholdername"),
type: "feat",
};
const created = await this.actor.createEmbeddedEntity("OwnedItem", data);
const feat = this.actor.getOwnedItem(created._id);
// Default values
//feat.rank = 1;
//feat.xp_used = 0;
feat.sheet.render(true);
return feat;
}
/**
* React to a skill from the skills list been clicked.
* @param {string} skillId Unique ID of the skill been clicked.
*/
async _onSkillClicked(skillId) {
new game.l5r5e.DicePickerDialog({ skillId: skillId, actor: this.actor }).render(true);
}
}

View File

@@ -0,0 +1,153 @@
/**
* Base Sheet for Actor and Npc
*/
export class BaseSheetL5r5e extends ActorSheet {
/**
* Commons datas
*/
getData() {
const sheetData = super.getData();
this._prepareItems(sheetData);
const feats = sheetData.items.filter((item) => item.type === "feat");
sheetData.data.feats = feats;
sheetData.data.stances = CONFIG.L5r5e.stances;
return sheetData;
}
/**
* Update the actor.
* @param event
* @param formData
*/
_updateObject(event, formData) {
return this.object.update(formData);
}
/**
* Prepare item data to be displayed in the actor sheet.
* @param sheetData Data of the actor been displayed in the sheet.
*/
_prepareItems(sheetData) {
for (let item of sheetData.items) {
switch (item.type) {
case "weapon":
item.isWeapon = true;
item.isEquipment = true;
break;
case "armor":
item.isArmor = true;
item.isEquipment = true;
break;
case "feat":
item.isFeat = true;
break;
case "quality":
item.isQuality = true;
break;
case "xp-advancement":
item.isXpAdvancement = true;
break;
default:
item.isEquipment = true;
break;
}
}
}
/**
* TODO
*/
_prepareFeats() {}
/**
* Subscribe to events from the sheet.
* @param html HTML content of the sheet.
*/
activateListeners(html) {
super.activateListeners(html);
// Everything below here is only needed if the sheet is editable
if (!this.options.editable) {
return;
}
// Update Inventory Item
html.find(".item-edit").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".item");
const itemId = li.data("itemId");
const item = this.actor.getOwnedItem(itemId);
item.sheet.render(true);
});
// Delete Inventory Item
html.find(".item-delete").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".item");
this.actor.deleteOwnedItem(li.data("itemId"));
});
html.find(".feat-add").on("click", (ev) => {
this._createFeat();
});
html.find(".feat-delete").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".feat");
const featId = li.data("featId");
console.log("Remove feat" + featId + " clicked");
this.actor.deleteOwnedItem(featId);
});
html.find(".feat-edit").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".feat");
const featId = li.data("featId");
const feat = this.actor.getOwnedItem(featId);
feat.sheet.render(true);
});
html.find(".skill-name").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".skill");
this._onSkillClicked(li.data("skill"));
});
html.find(".acquisition-add").on("click", (ev) => {
this._createFeat();
});
}
/**
* Creates a new feat for the character and shows a window to edit it.
*/
async _createFeat() {
const data = {
name: game.i18n.localize("l5r5e.featplaceholdername"),
type: "feat",
};
const created = await this.actor.createEmbeddedEntity("OwnedItem", data);
const feat = this.actor.getOwnedItem(created._id);
// Default values
//feat.rank = 1;
//feat.xp_used = 0;
feat.sheet.render(true);
return feat;
}
/**
* React to a skill from the skills list been clicked.
* @param {string} skillId Unique ID of the skill been clicked.
*/
async _onSkillClicked(skillId) {
new game.l5r5e.DicePickerDialog({ skillId: skillId, actor: this.actor }).render(true);
}
}

View File

@@ -1,5 +1,9 @@
// TODO extend ActorSheetL5r5e ?
export class NpcSheetL5r5e extends ActorSheet {
import { BaseSheetL5r5e } from "./base-sheet.js";
/**
* NPC Sheet
*/
export class NpcSheetL5r5e extends BaseSheetL5r5e {
static types = ["minion", "adversary"];
static get defaultOptions() {
@@ -18,133 +22,8 @@ export class NpcSheetL5r5e extends ActorSheet {
this._prepareItems(sheetData);
sheetData.data.feats = sheetData.items.filter((item) => item.type === "feat");
sheetData.data.types = NpcSheetL5r5e.types;
sheetData.data.stances = CONFIG.L5r5e.stances;
return sheetData;
}
/**
* Update the actor.
* @param event
* @param formData
*/
_updateObject(event, formData) {
return this.object.update(formData);
}
/**
* Prepare item data to be displayed in the actor sheet.
* @param sheetData Data of the actor been displayed in the sheet.
*/
_prepareItems(sheetData) {
for (let item of sheetData.items) {
switch (item.type) {
case "weapon":
item.isWeapon = true;
item.isEquipment = true;
break;
case "armor":
item.isArmor = true;
item.isEquipment = true;
break;
case "feat":
item.isFeat = true;
break;
default:
item.isEquipment = true;
break;
}
}
}
_prepareFeats() {}
/**
* Subscribe to events from the sheet.
* @param html HTML content of the sheet.
*/
activateListeners(html) {
super.activateListeners(html);
// Everything below here is only needed if the sheet is editable
if (!this.options.editable) return;
// Update Inventory Item
html.find(".item-edit").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".item");
const itemId = li.data("itemId");
const item = this.actor.getOwnedItem(itemId);
item.sheet.render(true);
});
// Delete Inventory Item
html.find(".item-delete").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".item");
const itemId = li.data("itemId");
this.actor.deleteOwnedItem(itemId);
});
html.find(".feat-add").on("click", (ev) => {
this._createFeat();
});
html.find(".feat-delete").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".feat");
const featId = li.data("featId");
console.log("Remove feat" + featId + " clicked");
this.actor.deleteOwnedItem(featId);
});
html.find(".feat-edit").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".feat");
const featId = li.data("featId");
const feat = this.actor.getOwnedItem(featId);
feat.sheet.render(true);
});
html.find(".skill-name").on("click", (ev) => {
const li = $(ev.currentTarget).parents(".skill");
const skillId = li.data("skill");
this._onSkillClicked(skillId);
});
html.find(".acquisition-add").on("click", (ev) => {
this._createFeat();
});
}
/**
* Creates a new feat for the character and shows a window to edit it.
*/
async _createFeat() {
const data = {
name: game.i18n.localize("l5r5e.featplaceholdername"),
type: "feat",
};
const created = await this.actor.createEmbeddedEntity("OwnedItem", data);
const feat = this.actor.getOwnedItem(created._id);
// Default values
//feat.rank = 1;
//feat.xp_used = 0;
feat.sheet.render(true);
return feat;
}
/**
* React to a skill from the skills list been clicked.
* @param {string} skillId Unique ID of the skill been clicked.
*/
async _onSkillClicked(skillId) {
new game.l5r5e.DicePickerDialog({ skillId: skillId, actor: this.actor }).render(true);
}
}

View File

@@ -44,6 +44,7 @@ export class TwentyQuestionsDialog extends FormApplication {
...super.getData(options),
elementsList: this._getElements(),
skillsList: this._getSkills(),
featsList: CONFIG.L5r5e.feats,
actor: this.actor.data.data,
};
}
@@ -96,13 +97,13 @@ export class TwentyQuestionsDialog extends FormApplication {
actorTmp.social.glory = formData.step2_social_glory;
actorTmp.identity.school = formData.step3_school;
actorTmp.identity.roles = formData.step3_roles;
// actorTmp = formData.step3_tech_kata;
// actorTmp = formData.step3_tech_kiho;
// actorTmp = formData.step3_tech_invocations;
// actorTmp = formData.step3_tech_rituals;
// actorTmp = formData.step3_tech_shuji;
// actorTmp = formData.step3_tech_maho;
// actorTmp = formData.step3_tech_ninjutsu;
// actorTmp = formData.step3_feat_kata;
// actorTmp = formData.step3_feat_kiho;
// actorTmp = formData.step3_feat_invocations;
// actorTmp = formData.step3_feat_rituals;
// actorTmp = formData.step3_feat_shuji;
// actorTmp = formData.step3_feat_maho;
// actorTmp = formData.step3_feat_ninjutsu;
// actorTmp = formData.step3_feats;
// actorTmp = formData.step3_school_ability;
// actorTmp = formData.step3_equipment;