Compare commits

..

9 Commits

50 changed files with 300 additions and 235 deletions

View File

@ -1,13 +1,15 @@
{ {
"ACTOR": { "TYPES": {
"TypePersonnage": "Personnage" "Actor": {
"personnage" : "Personnage"
}, },
"ITEM": { "Item": {
"TypeArme": "Arme", "arme" : "Arme",
"TypeEquipement": "Equipement", "equipement" : "Equipement",
"TypeTarot": "Tarot", "tarot" : "Tarot",
"TypeElementbio": "Element Biographique", "elementbio" : "Elément Biographique",
"TypeArchetype": "Archetype", "archetype" : "Archetype",
"TypeSortilege": "Sortilège" "sortilege" : "Sortilège"
}
} }
} }

View File

@ -11,8 +11,8 @@ export class MaleficesActorSheet extends ActorSheet {
/** @override */ /** @override */
static get defaultOptions() { static get defaultOptions() {
return mergeObject(super.defaultOptions, { return foundry.utils.mergeObject(super.defaultOptions, {
classes: ["fvtt-malefices", "sheet", "actor"], classes: ["fvtt-malefices", "sheet", "actor", "malefices-actor-sheet"],
template: "systems/fvtt-malefices/templates/actors/actor-sheet.hbs", template: "systems/fvtt-malefices/templates/actors/actor-sheet.hbs",
width: 640, width: 640,
height:680, height:680,
@ -33,19 +33,19 @@ export class MaleficesActorSheet extends ActorSheet {
name: this.actor.name, name: this.actor.name,
editable: this.isEditable, editable: this.isEditable,
cssClass: this.isEditable ? "editable" : "locked", cssClass: this.isEditable ? "editable" : "locked",
system: duplicate(this.object.system), system: foundry.utils.duplicate(this.object.system),
limited: this.object.limited, limited: this.object.limited,
armes: duplicate(this.actor.getArmes()), armes: foundry.utils.duplicate(this.actor.getArmes()),
tarots: duplicate(this.actor.getTarots()), tarots: foundry.utils.duplicate(this.actor.getTarots()),
tarotsCache: duplicate(this.actor.getHiddenTarots()), tarotsCache: foundry.utils.duplicate(this.actor.getHiddenTarots()),
archetype: duplicate(this.actor.getArchetype()), archetype: foundry.utils.duplicate(this.actor.getArchetype()),
equipements: duplicate(this.actor.getEquipements()), equipements: foundry.utils.duplicate(this.actor.getEquipements()),
subActors: duplicate(this.actor.getSubActors()), subActors: foundry.utils.duplicate(this.actor.getSubActors()),
phyMalus: this.actor.getPhysiqueMalus(), phyMalus: this.actor.getPhysiqueMalus(),
elementsbio: this.actor.getElementsBio(), elementsbio: this.actor.getElementsBio(),
sorts: this.actor.getSorts(), sorts: this.actor.getSorts(),
description: await TextEditor.enrichHTML(this.object.system.description, { async: true }), description: await TextEditor.enrichHTML(this.object.system.biodata.description, { async: true }),
notes: await TextEditor.enrichHTML(this.object.system.notes, { async: true }), notes: await TextEditor.enrichHTML(this.object.system.biodata.notes, { async: true }),
equipementlibre: await TextEditor.enrichHTML(this.object.system.equipementlibre, { async: true }), equipementlibre: await TextEditor.enrichHTML(this.object.system.equipementlibre, { async: true }),
options: this.options, options: this.options,
owner: this.document.isOwner, owner: this.document.isOwner,
@ -54,7 +54,7 @@ export class MaleficesActorSheet extends ActorSheet {
} }
this.formData = formData; this.formData = formData;
console.log("PC : ", formData, this.object); console.log("PC : ", formData, this.object );
return formData; return formData;
} }

View File

@ -29,7 +29,7 @@ export class MaleficesActor extends Actor {
if (data instanceof Array) { if (data instanceof Array) {
return super.create(data, options); return super.create(data, options);
} }
// If the created actor has items (only applicable to duplicated actors) bypass the new actor creation logic // If the created actor has items (only applicable to foundry.utils.duplicated actors) bypass the new actor creation logic
if (data.items) { if (data.items) {
let actor = super.create(data, options); let actor = super.create(data, options);
return actor; return actor;
@ -92,7 +92,7 @@ export class MaleficesActor extends Actor {
return comp; return comp;
} }
getArchetype() { getArchetype() {
let comp = duplicate(this.items.find(item => item.type == 'archetype') || {name: "Pas d'archetype"}) let comp = foundry.utils.duplicate(this.items.find(item => item.type == 'archetype') || {name: "Pas d'archetype"})
if (comp && comp.system) { if (comp && comp.system) {
comp.tarot = MaleficesUtility.getTarot(comp.system.lametutelaire) comp.tarot = MaleficesUtility.getTarot(comp.system.lametutelaire)
} }
@ -101,25 +101,25 @@ export class MaleficesActor extends Actor {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getElementsBio() { getElementsBio() {
let comp = duplicate(this.items.filter(item => item.type == 'elementbio') || []) let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'elementbio') || [])
MaleficesUtility.sortArrayObjectsByName(comp) MaleficesUtility.sortArrayObjectsByName(comp)
return comp; return comp;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getTarots() { getTarots() {
let comp = duplicate(this.items.filter(item => item.type == 'tarot' && !item.system.isgm) || []) let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'tarot' && !item.system.isgm) || [])
MaleficesUtility.sortArrayObjectsByName(comp) MaleficesUtility.sortArrayObjectsByName(comp)
return comp; return comp;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getHiddenTarots() { getHiddenTarots() {
let comp = duplicate(this.items.filter(item => item.type == 'tarot' && item.system.isgm) || []) let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'tarot' && item.system.isgm) || [])
MaleficesUtility.sortArrayObjectsByName(comp) MaleficesUtility.sortArrayObjectsByName(comp)
return comp; return comp;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getArmes() { getArmes() {
let comp = duplicate(this.items.filter(item => item.type == 'arme') || []) let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'arme') || [])
MaleficesUtility.sortArrayObjectsByName(comp) MaleficesUtility.sortArrayObjectsByName(comp)
return comp; return comp;
} }
@ -127,7 +127,7 @@ export class MaleficesActor extends Actor {
getItemById(id) { getItemById(id) {
let item = this.items.find(item => item.id == id); let item = this.items.find(item => item.id == id);
if (item) { if (item) {
item = duplicate(item) item = foundry.utils.duplicate(item)
} }
return item; return item;
} }
@ -173,7 +173,7 @@ export class MaleficesActor extends Actor {
/* ------------------------------------------- */ /* ------------------------------------------- */
async buildContainerTree() { async buildContainerTree() {
let equipments = duplicate(this.items.filter(item => item.type == "equipment") || []) let equipments = foundry.utils.duplicate(this.items.filter(item => item.type == "equipment") || [])
for (let equip1 of equipments) { for (let equip1 of equipments) {
if (equip1.system.iscontainer) { if (equip1.system.iscontainer) {
equip1.system.contents = [] equip1.system.contents = []
@ -238,13 +238,13 @@ export class MaleficesActor extends Actor {
getSubActors() { getSubActors() {
let subActors = []; let subActors = [];
for (let id of this.system.subactors) { for (let id of this.system.subactors) {
subActors.push(duplicate(game.actors.get(id))) subActors.push(foundry.utils.duplicate(game.actors.get(id)))
} }
return subActors; return subActors;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async addSubActor(subActorId) { async addSubActor(subActorId) {
let subActors = duplicate(this.system.subactors); let subActors = foundry.utils.duplicate(this.system.subactors);
subActors.push(subActorId); subActors.push(subActorId);
await this.update({ 'system.subactors': subActors }); await this.update({ 'system.subactors': subActors });
} }
@ -291,7 +291,7 @@ export class MaleficesActor extends Actor {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
incDecAttr(attrKey, value) { incDecAttr(attrKey, value) {
let attr = duplicate(this.system.attributs[attrKey]) let attr = foundry.utils.duplicate(this.system.attributs[attrKey])
attr.value += value attr.value += value
this.update( { [`system.attributs.${attrKey}`]: attr}) this.update( { [`system.attributs.${attrKey}`]: attr})
} }
@ -341,6 +341,7 @@ export class MaleficesActor extends Actor {
rollData.isReroll = false rollData.isReroll = false
rollData.confrontationDegre = 0 rollData.confrontationDegre = 0
rollData.confrontationModif = 0 rollData.confrontationModif = 0
rollData.config = game.system.malefices.config
console.log("ROLLDATA", rollData) console.log("ROLLDATA", rollData)
@ -358,7 +359,7 @@ export class MaleficesActor extends Actor {
rollAttribut(attrKey) { rollAttribut(attrKey) {
let attr = this.system.attributs[attrKey] let attr = this.system.attributs[attrKey]
let rollData = this.getCommonRollData() let rollData = this.getCommonRollData()
rollData.attr = duplicate(attr) rollData.attr = foundry.utils.duplicate(attr)
rollData.mode = "attribut" rollData.mode = "attribut"
rollData.title = attr.label rollData.title = attr.label
rollData.img = this.getAtttributImage(attrKey) rollData.img = this.getAtttributImage(attrKey)
@ -369,12 +370,12 @@ export class MaleficesActor extends Actor {
rollArme(weaponId) { rollArme(weaponId) {
let arme = this.items.get(weaponId) let arme = this.items.get(weaponId)
if (arme) { if (arme) {
arme = duplicate(arme) arme = foundry.utils.duplicate(arme)
let rollData = this.getCommonRollData() let rollData = this.getCommonRollData()
if (arme.system.armetype == "mainsnues" || arme.system.armetype == "epee") { if (arme.system.armetype == "mainsnues" || arme.system.armetype == "epee") {
rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor( (this.getPhysiqueMalus()+this.system.attributs.physique+this.system.attributs.habilite) / 2) } rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor( (this.getPhysiqueMalus()+this.system.attributs.physique.value+this.system.attributs.habilite.value) / 2) }
} else { } else {
rollData.attr = duplicate(this.system.attributs.habilite) rollData.attr = foundry.utils.duplicate(this.system.attributs.habilite)
} }
rollData.mode = "arme" rollData.mode = "arme"
rollData.arme = arme rollData.arme = arme

View File

@ -115,7 +115,7 @@ export class MaleficesCommands {
maxPlayerCard: 4, maxPlayerCard: 4,
maxSecretCard: 1, maxSecretCard: 1,
cards: [], cards: [],
players: duplicate(game.users), players: foundry.utils.duplicate(game.users),
secretCards: [], secretCards: [],
deck: MaleficesUtility.getTarots() deck: MaleficesUtility.getTarots()
} }
@ -138,6 +138,7 @@ export class MaleficesCommands {
selectedCard.system.ispositif = (Math.random() > 0.5) selectedCard.system.ispositif = (Math.random() > 0.5)
} }
selectedCard.system.isgm = false selectedCard.system.isgm = false
selectedCard.value = (selectedCard.system.ispositif)? selectedCard.system.numericvalueup : selectedCard.system.numericvaluedown
MaleficesUtility.createChatMessage(game.user.name, "", { MaleficesUtility.createChatMessage(game.user.name, "", {
content: await renderTemplate(`systems/fvtt-malefices/templates/chat/display-tarot-card.hbs`, selectedCard) content: await renderTemplate(`systems/fvtt-malefices/templates/chat/display-tarot-card.hbs`, selectedCard)
}) })

View File

@ -27,4 +27,41 @@ export const MALEFICES_CONFIG = {
"epee": "Epée, sabre, javelot, etc", "epee": "Epée, sabre, javelot, etc",
"mainsnues": "Mains Nues" "mainsnues": "Mains Nues"
}, },
confrontationDegreOptions :{
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5"
},
confrontationModifOptions: {
"-1": "-1",
"0": "0",
"1": "+1"
},
bonusMalusPersoOptions: [
{value: "-3", label: "-3"},
{value: "-2", label: "-2"},
{value: "-1", label: "-1"},
{value: "0", label: "0"},
{value: "+1", label: "+1"},
{value: "+2", label: "+2"},
{value: "+3", label: "+3"}
],
bonusMalusDefOptions: [
{value: "-6", label: "-6 (réussite critique)"},
{value: "-3", label: "-3 (réussite)"},
{value: "0", label: "0 (echec ou pas d'esquive)"},
{value: "+3", label: "+3 (echec critique)"}
],
bonusMalusPorteeOptions: [
{value: "1", label: "+1 (Portée courte)"},
{value: "0", label: "0 (Portée moyenne)"},
{value: "-1", label: "-1 (Portée longue)"}
]
} }

View File

@ -9,7 +9,7 @@ export class MaleficesItemSheet extends ItemSheet {
/** @override */ /** @override */
static get defaultOptions() { static get defaultOptions() {
return mergeObject(super.defaultOptions, { return foundry.utils.mergeObject(super.defaultOptions, {
classes: ["fvtt-malefices", "sheet", "item"], classes: ["fvtt-malefices", "sheet", "item"],
template: "systems/fvtt-malefices/templates/item-sheet.hbs", template: "systems/fvtt-malefices/templates/item-sheet.hbs",
dragDrop: [{ dragSelector: null, dropSelector: null }], dragDrop: [{ dragSelector: null, dropSelector: null }],
@ -19,20 +19,6 @@ export class MaleficesItemSheet extends ItemSheet {
}); });
} }
/* -------------------------------------------- */
_getHeaderButtons() {
let buttons = super._getHeaderButtons();
// Add "Post to chat" button
// We previously restricted this to GM and editable items only. If you ever find this comment because it broke something: eh, sorry!
buttons.unshift(
{
class: "post",
icon: "fas fa-comment",
onclick: ev => { }
})
return buttons
}
/* -------------------------------------------- */ /* -------------------------------------------- */
/** @override */ /** @override */
setPosition(options = {}) { setPosition(options = {}) {
@ -57,8 +43,8 @@ export class MaleficesItemSheet extends ItemSheet {
name: this.object.name, name: this.object.name,
editable: this.isEditable, editable: this.isEditable,
cssClass: this.isEditable ? "editable" : "locked", cssClass: this.isEditable ? "editable" : "locked",
system: duplicate(this.object.system), system: foundry.utils.duplicate(this.object.system),
config: duplicate(game.system.malefices.config), config: foundry.utils.duplicate(game.system.malefices.config),
limited: this.object.limited, limited: this.object.limited,
options: this.options, options: this.options,
owner: this.document.isOwner, owner: this.document.isOwner,
@ -90,7 +76,7 @@ export class MaleficesItemSheet extends ItemSheet {
/* -------------------------------------------- */ /* -------------------------------------------- */
postItem() { postItem() {
let chatData = duplicate(this.item) let chatData = foundry.utils.duplicate(this.item)
if (this.actor) { if (this.actor) {
chatData.actor = { id: this.actor.id }; chatData.actor = { id: this.actor.id };
} }

View File

@ -18,6 +18,7 @@ import { MaleficesItem } from "./malefices-item.js";
import { MaleficesHotbar } from "./malefices-hotbar.js" import { MaleficesHotbar } from "./malefices-hotbar.js"
import { MaleficesCharacterSummary } from "./malefices-summary-app.js" import { MaleficesCharacterSummary } from "./malefices-summary-app.js"
import { MALEFICES_CONFIG } from "./malefices-config.js" import { MALEFICES_CONFIG } from "./malefices-config.js"
import { ClassCounter} from "https://www.uberwald.me/fvtt_appcount/count-class-ready.js"
/* -------------------------------------------- */ /* -------------------------------------------- */
/* Foundry VTT Initialization */ /* Foundry VTT Initialization */
@ -64,6 +65,8 @@ Hooks.once("init", async function () {
Items.unregisterSheet("core", ItemSheet); Items.unregisterSheet("core", ItemSheet);
Items.registerSheet("fvtt-malefices", MaleficesItemSheet, { makeDefault: true }); Items.registerSheet("fvtt-malefices", MaleficesItemSheet, { makeDefault: true });
MaleficesUtility.init()
}); });
/* -------------------------------------------- */ /* -------------------------------------------- */
@ -77,32 +80,7 @@ function welcomeMessage() {
<p>Le Livre de Base de Maléfices v4 est nécessaire pour jouer : https://arkhane-asylum.fr/en/malefices/</p> <p>Le Livre de Base de Maléfices v4 est nécessaire pour jouer : https://arkhane-asylum.fr/en/malefices/</p>
<p>Maléfices et un jeu de rôle publié par Arkhane Asylum Publishing, tout les droits leur appartiennent.</p> <p>Maléfices et un jeu de rôle publié par Arkhane Asylum Publishing, tout les droits leur appartiennent.</p>
<p>Système développé par LeRatierBretonnien avec l'aide de la Dame du Lac et Malik, support sur le <a href="https://discord.gg/pPSDNJk">Discord FR de Foundry</a>.</p> <p>Système développé par LeRatierBretonnien avec l'aide de la Dame du Lac et Malik, support sur le <a href="https://discord.gg/pPSDNJk">Discord FR de Foundry</a>.</p>
<p>Commandes : /tirage pour le tirage des tarots, /tirer pour tirer une simple carte et /resume pour le résumé des PJs (MJ seulement)` }); <p>Commandes : /tirage pour le tirage des tarots, /carte pour tirer une simple carte et /resume pour le résumé des PJs (MJ seulement)` });
}
}
/* -------------------------------------------- */
// Register world usage statistics
function registerUsageCount(registerKey) {
if (game.user.isGM) {
game.settings.register(registerKey, "world-key", {
name: "Unique world key",
scope: "world",
config: false,
default: "",
type: String
});
let worldKey = game.settings.get(registerKey, "world-key")
if (worldKey == undefined || worldKey == "") {
worldKey = randomID(32)
game.settings.set(registerKey, "world-key", worldKey)
}
// Simple API counter
let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
//$.ajaxSetup({
//headers: { 'Access-Control-Allow-Origin': '*' }
//})
$.ajax(regURL)
} }
} }
@ -120,13 +98,7 @@ Hooks.once("ready", function () {
}); });
} }
// CSS patch for v9 ClassCounter.registerUsageCount();
if (game.version) {
let sidebar = document.getElementById("sidebar");
sidebar.style.width = "min-content";
}
registerUsageCount('fvtt-malefices')
welcomeMessage(); welcomeMessage();
MaleficesUtility.ready() MaleficesUtility.ready()
MaleficesCharacterSummary.ready() MaleficesCharacterSummary.ready()

View File

@ -11,7 +11,7 @@ export class MaleficesNPCSheet extends ActorSheet {
/** @override */ /** @override */
static get defaultOptions() { static get defaultOptions() {
return mergeObject(super.defaultOptions, { return foundry.utils.mergeObject(super.defaultOptions, {
classes: ["Malefices", "sheet", "actor"], classes: ["Malefices", "sheet", "actor"],
template: "systems/fvtt-malefices/templates/npc-sheet.html", template: "systems/fvtt-malefices/templates/npc-sheet.html",
width: 640, width: 640,
@ -25,7 +25,7 @@ export class MaleficesNPCSheet extends ActorSheet {
/* -------------------------------------------- */ /* -------------------------------------------- */
async getData() { async getData() {
const objectData = this.object.system const objectData = this.object.system
let actorData = duplicate(objectData) let actorData = foundry.utils.duplicate(objectData)
let formData = { let formData = {
title: this.title, title: this.title,
@ -38,16 +38,16 @@ export class MaleficesNPCSheet extends ActorSheet {
data: actorData, data: actorData,
limited: this.object.limited, limited: this.object.limited,
skills: this.actor.getSkills( ), skills: this.actor.getSkills( ),
weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ), weapons: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getWeapons()) ),
armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())), armors: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getArmors())),
shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())), shields: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getShields())),
spells: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getLore())), spells: this.actor.checkAndPrepareEquipments( foundry.utils.duplicate(this.actor.getLore())),
equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsOnly()) ), equipments: this.actor.checkAndPrepareEquipments(foundry.utils.duplicate(this.actor.getEquipmentsOnly()) ),
equippedWeapons: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquippedWeapons()) ), equippedWeapons: this.actor.checkAndPrepareEquipments(foundry.utils.duplicate(this.actor.getEquippedWeapons()) ),
equippedArmor: this.actor.getEquippedArmor(), equippedArmor: this.actor.getEquippedArmor(),
equippedShield: this.actor.getEquippedShield(), equippedShield: this.actor.getEquippedShield(),
subActors: duplicate(this.actor.getSubActors()), subActors: foundry.utils.duplicate(this.actor.getSubActors()),
moneys: duplicate(this.actor.getMoneys()), moneys: foundry.utils.duplicate(this.actor.getMoneys()),
encCapacity: this.actor.getEncumbranceCapacity(), encCapacity: this.actor.getEncumbranceCapacity(),
saveRolls: this.actor.getSaveRoll(), saveRolls: this.actor.getSaveRoll(),
conditions: this.actor.getConditions(), conditions: this.actor.getConditions(),

View File

@ -43,7 +43,7 @@ export class MaleficesCharacterSummary extends Application {
/* -------------------------------------------- */ /* -------------------------------------------- */
static get defaultOptions() { static get defaultOptions() {
return mergeObject(super.defaultOptions, { return foundry.utils.mergeObject(super.defaultOptions, {
template: "systems/fvtt-malefices/templates/dialogs/character-summary.hbs", template: "systems/fvtt-malefices/templates/dialogs/character-summary.hbs",
popOut: true, popOut: true,
resizable: true, resizable: true,

View File

@ -94,7 +94,7 @@ export class MaleficesTirageTarotDialog extends Dialog {
} }
this.tirageData.secretCards.push(selectedCard) this.tirageData.secretCards.push(selectedCard)
} }
this.tirageData.actors = duplicate(game.actors) this.tirageData.actors = foundry.utils.duplicate(game.actors)
this.tirageData.state = 'attribute-to-actor' this.tirageData.state = 'attribute-to-actor'
}else { }else {
this.sendCardRequest() this.sendCardRequest()

View File

@ -5,18 +5,18 @@ import { MaleficesCommands } from "./malefices-commands.js";
/* -------------------------------------------- */ /* -------------------------------------------- */
export class MaleficesUtility { export class MaleficesUtility {
/* -------------------------------------------- */ /* -------------------------------------------- */
static async ready() { static async init() {
Hooks.on('renderChatLog', (log, html, data) => MaleficesUtility.chatListeners(html)); Hooks.on('renderChatLog', (log, html, data) => MaleficesUtility.chatListeners(html));
/*Hooks.on("dropCanvasData", (canvas, data) => {
MaleficesUtility.dropItemOnToken(canvas, data)
});*/
this.rollDataStore = {} this.rollDataStore = {}
this.defenderStore = {} this.defenderStore = {}
MaleficesCommands.init(); MaleficesCommands.init();
}
/* -------------------------------------------- */
static async ready() {
Handlebars.registerHelper('count', function (list) { Handlebars.registerHelper('count', function (list) {
return list.length; return list.length;
@ -65,7 +65,7 @@ export class MaleficesUtility {
/*-------------------------------------------- */ /*-------------------------------------------- */
static getTarots() { static getTarots() {
return duplicate(this.tarots) return foundry.utils.duplicate(this.tarots)
} }
static getTarot(tId) { static getTarot(tId) {
return this.tarots.find(t => t._id == tId) return this.tarots.find(t => t._id == tId)
@ -196,7 +196,7 @@ export class MaleficesUtility {
let id = rollData.rollId let id = rollData.rollId
let oldRollData = this.rollDataStore[id] || {} let oldRollData = this.rollDataStore[id] || {}
let newRollData = mergeObject(oldRollData, rollData) let newRollData = foundry.utils.mergeObject(oldRollData, rollData)
this.rollDataStore[id] = newRollData this.rollDataStore[id] = newRollData
} }
@ -402,9 +402,9 @@ export class MaleficesUtility {
// Performs roll // Performs roll
console.log("Roll formula", diceFormula) console.log("Roll formula", diceFormula)
let myRoll = new Roll(diceFormula).roll({ async: false }) let myRoll = await new Roll(diceFormula).roll()
await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode")) await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
rollData.roll = myRoll rollData.roll = foundry.utils.duplicate(myRoll)
rollData.total = myRoll.total rollData.total = myRoll.total
this.computeResults(rollData) this.computeResults(rollData)
@ -462,7 +462,7 @@ export class MaleficesUtility {
/* -------------------------------------------- */ /* -------------------------------------------- */
static blindMessageToGM(chatOptions) { static blindMessageToGM(chatOptions) {
let chatGM = duplicate(chatOptions); let chatGM = foundry.utils.duplicate(chatOptions);
chatGM.whisper = this.getUsers(user => user.isGM); chatGM.whisper = this.getUsers(user => user.isGM);
chatGM.content = "Blinde message of " + game.user.name + "<br>" + chatOptions.content; chatGM.content = "Blinde message of " + game.user.name + "<br>" + chatOptions.content;
console.log("blindMessageToGM", chatGM); console.log("blindMessageToGM", chatGM);
@ -512,7 +512,7 @@ export class MaleficesUtility {
/* -------------------------------------------- */ /* -------------------------------------------- */
static getBasicRollData() { static getBasicRollData() {
let rollData = { let rollData = {
rollId: randomID(16), rollId: foundry.utils.randomID(16),
bonusMalusPerso: 0, bonusMalusPerso: 0,
bonusMalusSituation: 0, bonusMalusSituation: 0,
bonusMalusDef: 0, bonusMalusDef: 0,

View File

Binary file not shown.

View File

@ -0,0 +1 @@
MANIFEST-000018

View File

View File

@ -0,0 +1,15 @@
2024/04/26-18:07:32.626395 7efdd82006c0 Recovering log #16
2024/04/26-18:07:32.637138 7efdd82006c0 Delete type=3 #14
2024/04/26-18:07:32.637193 7efdd82006c0 Delete type=0 #16
2024/04/26-18:35:17.538874 7efdd72006c0 Level-0 table #21: started
2024/04/26-18:35:17.542754 7efdd72006c0 Level-0 table #21: 50638 bytes OK
2024/04/26-18:35:17.548838 7efdd72006c0 Delete type=0 #19
2024/04/26-18:35:17.591000 7efdd72006c0 Manual compaction at level-0 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end)
2024/04/26-18:35:17.591055 7efdd72006c0 Manual compaction at level-1 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at '!items!xtYE2kVIfNtrXSoU' @ 46 : 1
2024/04/26-18:35:17.591063 7efdd72006c0 Compacting 1@1 + 1@2 files
2024/04/26-18:35:17.595486 7efdd72006c0 Generated table #22@1: 23 keys, 50638 bytes
2024/04/26-18:35:17.595513 7efdd72006c0 Compacted 1@1 + 1@2 files => 50638 bytes
2024/04/26-18:35:17.602259 7efdd72006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/04/26-18:35:17.602378 7efdd72006c0 Delete type=2 #5
2024/04/26-18:35:17.602577 7efdd72006c0 Delete type=2 #21
2024/04/26-18:35:17.632494 7efdd72006c0 Manual compaction at level-1 from '!items!xtYE2kVIfNtrXSoU' @ 46 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end)

View File

@ -0,0 +1,8 @@
2023/10/26-09:14:30.238994 7f5603fff6c0 Recovering log #12
2023/10/26-09:14:30.250498 7f5603fff6c0 Delete type=3 #10
2023/10/26-09:14:30.250614 7f5603fff6c0 Delete type=0 #12
2023/10/26-09:23:17.065670 7f56037fe6c0 Level-0 table #17: started
2023/10/26-09:23:17.065742 7f56037fe6c0 Level-0 table #17: 0 bytes OK
2023/10/26-09:23:17.072462 7f56037fe6c0 Delete type=0 #15
2023/10/26-09:23:17.079476 7f56037fe6c0 Manual compaction at level-0 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end)
2023/10/26-09:23:17.079561 7f56037fe6c0 Manual compaction at level-1 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end)

Binary file not shown.

View File

Binary file not shown.

View File

@ -0,0 +1 @@
MANIFEST-000018

View File

15
packs/malefices-armes/LOG Normal file
View File

@ -0,0 +1,15 @@
2024/04/26-18:07:32.613484 7efdd96006c0 Recovering log #16
2024/04/26-18:07:32.623734 7efdd96006c0 Delete type=3 #14
2024/04/26-18:07:32.623791 7efdd96006c0 Delete type=0 #16
2024/04/26-18:35:17.569282 7efdd72006c0 Level-0 table #21: started
2024/04/26-18:35:17.582262 7efdd72006c0 Level-0 table #21: 2093 bytes OK
2024/04/26-18:35:17.590842 7efdd72006c0 Delete type=0 #19
2024/04/26-18:35:17.591036 7efdd72006c0 Manual compaction at level-0 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end)
2024/04/26-18:35:17.612788 7efdd72006c0 Manual compaction at level-1 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at '!items!nkRQU81L1gWOfaeo' @ 18 : 1
2024/04/26-18:35:17.612797 7efdd72006c0 Compacting 1@1 + 1@2 files
2024/04/26-18:35:17.615928 7efdd72006c0 Generated table #22@1: 9 keys, 2093 bytes
2024/04/26-18:35:17.615956 7efdd72006c0 Compacted 1@1 + 1@2 files => 2093 bytes
2024/04/26-18:35:17.622427 7efdd72006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/04/26-18:35:17.622520 7efdd72006c0 Delete type=2 #5
2024/04/26-18:35:17.622620 7efdd72006c0 Delete type=2 #21
2024/04/26-18:35:17.632530 7efdd72006c0 Manual compaction at level-1 from '!items!nkRQU81L1gWOfaeo' @ 18 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end)

View File

@ -0,0 +1,8 @@
2023/10/26-09:14:30.225660 7f56117fa6c0 Recovering log #12
2023/10/26-09:14:30.236009 7f56117fa6c0 Delete type=3 #10
2023/10/26-09:14:30.236095 7f56117fa6c0 Delete type=0 #12
2023/10/26-09:23:17.051895 7f56037fe6c0 Level-0 table #17: started
2023/10/26-09:23:17.051934 7f56037fe6c0 Level-0 table #17: 0 bytes OK
2023/10/26-09:23:17.058810 7f56037fe6c0 Delete type=0 #15
2023/10/26-09:23:17.072664 7f56037fe6c0 Manual compaction at level-0 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end)
2023/10/26-09:23:17.079499 7f56037fe6c0 Manual compaction at level-1 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end)

Binary file not shown.

View File

Binary file not shown.

View File

@ -0,0 +1 @@
MANIFEST-000018

View File

View File

@ -0,0 +1,15 @@
2024/04/26-18:07:32.640485 7efdd8c006c0 Recovering log #16
2024/04/26-18:07:32.650356 7efdd8c006c0 Delete type=3 #14
2024/04/26-18:07:32.650410 7efdd8c006c0 Delete type=0 #16
2024/04/26-18:35:17.622677 7efdd72006c0 Level-0 table #21: started
2024/04/26-18:35:17.625968 7efdd72006c0 Level-0 table #21: 855 bytes OK
2024/04/26-18:35:17.632284 7efdd72006c0 Delete type=0 #19
2024/04/26-18:35:17.632542 7efdd72006c0 Manual compaction at level-0 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end)
2024/04/26-18:35:17.632580 7efdd72006c0 Manual compaction at level-1 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at '!macros!zDPgmHiwNxBWhoYz' @ 6 : 1
2024/04/26-18:35:17.632588 7efdd72006c0 Compacting 1@1 + 1@2 files
2024/04/26-18:35:17.635838 7efdd72006c0 Generated table #22@1: 3 keys, 855 bytes
2024/04/26-18:35:17.635878 7efdd72006c0 Compacted 1@1 + 1@2 files => 855 bytes
2024/04/26-18:35:17.642105 7efdd72006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/04/26-18:35:17.642236 7efdd72006c0 Delete type=2 #5
2024/04/26-18:35:17.642702 7efdd72006c0 Delete type=2 #21
2024/04/26-18:35:17.667688 7efdd72006c0 Manual compaction at level-1 from '!macros!zDPgmHiwNxBWhoYz' @ 6 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end)

View File

@ -0,0 +1,8 @@
2023/10/26-09:14:30.253493 7f5610ff96c0 Recovering log #12
2023/10/26-09:14:30.264581 7f5610ff96c0 Delete type=3 #10
2023/10/26-09:14:30.264682 7f5610ff96c0 Delete type=0 #12
2023/10/26-09:23:17.058988 7f56037fe6c0 Level-0 table #17: started
2023/10/26-09:23:17.059024 7f56037fe6c0 Level-0 table #17: 0 bytes OK
2023/10/26-09:23:17.065403 7f56037fe6c0 Delete type=0 #15
2023/10/26-09:23:17.079441 7f56037fe6c0 Manual compaction at level-0 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end)
2023/10/26-09:23:17.079539 7f56037fe6c0 Manual compaction at level-1 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end)

Binary file not shown.

View File

Binary file not shown.

View File

@ -0,0 +1 @@
MANIFEST-000018

View File

View File

@ -0,0 +1,15 @@
2024/04/26-18:07:32.598967 7efdda0006c0 Recovering log #16
2024/04/26-18:07:32.609105 7efdda0006c0 Delete type=3 #14
2024/04/26-18:07:32.609187 7efdda0006c0 Delete type=0 #16
2024/04/26-18:35:17.558727 7efdd72006c0 Level-0 table #21: started
2024/04/26-18:35:17.562742 7efdd72006c0 Level-0 table #21: 3999 bytes OK
2024/04/26-18:35:17.569132 7efdd72006c0 Delete type=0 #19
2024/04/26-18:35:17.591025 7efdd72006c0 Manual compaction at level-0 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end)
2024/04/26-18:35:17.602706 7efdd72006c0 Manual compaction at level-1 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at '!items!zbGGMEQFdwVdlKAf' @ 44 : 1
2024/04/26-18:35:17.602723 7efdd72006c0 Compacting 1@1 + 1@2 files
2024/04/26-18:35:17.606397 7efdd72006c0 Generated table #22@1: 22 keys, 3999 bytes
2024/04/26-18:35:17.606426 7efdd72006c0 Compacted 1@1 + 1@2 files => 3999 bytes
2024/04/26-18:35:17.612531 7efdd72006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/04/26-18:35:17.612635 7efdd72006c0 Delete type=2 #5
2024/04/26-18:35:17.612730 7efdd72006c0 Delete type=2 #21
2024/04/26-18:35:17.632514 7efdd72006c0 Manual compaction at level-1 from '!items!zbGGMEQFdwVdlKAf' @ 44 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end)

View File

@ -0,0 +1,8 @@
2023/10/26-09:14:30.211232 7f5611ffb6c0 Recovering log #12
2023/10/26-09:14:30.222971 7f5611ffb6c0 Delete type=3 #10
2023/10/26-09:14:30.223076 7f5611ffb6c0 Delete type=0 #12
2023/10/26-09:23:17.024333 7f56037fe6c0 Level-0 table #17: started
2023/10/26-09:23:17.024403 7f56037fe6c0 Level-0 table #17: 0 bytes OK
2023/10/26-09:23:17.030633 7f56037fe6c0 Delete type=0 #15
2023/10/26-09:23:17.041759 7f56037fe6c0 Manual compaction at level-0 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end)
2023/10/26-09:23:17.051874 7f56037fe6c0 Manual compaction at level-1 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end)

Binary file not shown.

View File

@ -1,11 +1,11 @@
/* ==================== (A) Fonts ==================== */ /* ==================== (A) Fonts ==================== */
@font-face { @font-face {
font-family: "Rivanna"; font-family: "Rivanna";
src: url('../fonts/rivanna.ttf') format("truetype"); src: url('../fonts/rivanna.ttf') format("truetype");
} }
:root { :root {
/* =================== 1. ACTOR SHEET FONT STYLES =========== */ /* =================== 1. ACTOR SHEET FONT STYLES =========== */
--window-header-title-font-size: 1.3rem; --window-header-title-font-size: 1.3rem;
--window-header-title-font-weight: normal; --window-header-title-font-weight: normal;
--window-header-title-color: #f5f5f5; --window-header-title-color: #f5f5f5;
@ -27,7 +27,7 @@
--actor-label-font-weight: 700; --actor-label-font-weight: 700;
--actor-label-color: #464331c4; --actor-label-color: #464331c4;
/* =================== 2. DEBUGGING HIGHLIGHTERS ============ */ /* =================== 2. DEBUGGING HIGHLIGHTERS ============ */
--debug-background-color-red: #ff000054; --debug-background-color-red: #ff000054;
--debug-background-color-blue: #1d00ff54; --debug-background-color-blue: #1d00ff54;
--debug-background-color-green: #54ff0054; --debug-background-color-green: #54ff0054;
@ -35,29 +35,29 @@
--debug-box-shadow-red: inset 0 0 2px red; --debug-box-shadow-red: inset 0 0 2px red;
--debug-box-shadow-blue: inset 0 0 2px blue; --debug-box-shadow-blue: inset 0 0 2px blue;
--debug-box-shadow-green: inset 0 0 2px green; --debug-box-shadow-green: inset 0 0 2px green;
} }
/*@import url("https://fonts.googleapis.com/css2?family=Martel:wght@400;800&family=Roboto:wght@300;400;500&display=swap");*/ /*@import url("https://fonts.googleapis.com/css2?family=Martel:wght@400;800&family=Roboto:wght@300;400;500&display=swap");*/
/* Global styles & Font */ /* Global styles & Font */
.window-app { .fvtt-malefices .window-app {
text-align: justify; text-align: justify;
font-size: 16px; font-size: 16px;
letter-spacing: 1px; letter-spacing: 1px;
} }
/* Fonts */ /* Fonts */
.sheet header.sheet-header h1 input, .window-app .window-header, #actors .directory-list, #navigation #scene-list .scene.nav-item { .sheet header.sheet-header h1 input, .window-app .window-header, #actors .directory-list, #navigation #scene-list .scene.nav-item {
font-size: 1.0rem; font-size: 1.0rem;
} /* For title, sidebar character and scene */ } /* For title, sidebar character and scene */
.sheet nav.sheet-tabs { .fvtt-malefices .sheet nav.sheet-tabs {
font-size: 0.8rem; font-size: 0.8rem;
} /* For nav and title */ } /* For nav and title */
.window-app input, .fvtt-malefices .item-form, .sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #nav-toggle { .window-app input, .fvtt-malefices .item-form, .sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #nav-toggle {
font-size: 0.8rem; font-size: 0.8rem;
} }
.window-header{ .window-header{
background: rgba(0,0,0,0.75); background: rgba(0,0,0,0.75);
} }
.window-app.sheet .window-content { .window-app.sheet .window-content {
@ -235,6 +235,11 @@ table {border: 1px solid #7a7971;}
object-position: 50% 0; object-position: 50% 0;
border-width: 0px; border-width: 0px;
} }
.profile-img-container {
margin-right: 0.2rem;
max-width: 140px;
width: 140px;
}
.button-img { .button-img {
vertical-align: baseline; vertical-align: baseline;
@ -396,7 +401,7 @@ li.folder > .folder-header h3 {
/* ======================================== */ /* ======================================== */
/* Sheet */ /* Sheet */
.window-app.sheet .window-content .sheet-header{ .fvtt-malefices .window-app.sheet .window-content .sheet-header{
color: rgba(19, 18, 18, 0.95); color: rgba(19, 18, 18, 0.95);
background: url("../images/ui/background_01_clear.webp"); background: url("../images/ui/background_01_clear.webp");
/*background: #494e6b;*/ /*background: #494e6b;*/
@ -442,7 +447,7 @@ select {
margin-left: 2px; margin-left: 2px;
} }
.window-app .window-content, .window-app.sheet .window-content .sheet-body{ .fvtt-malefices .window-app .window-content, .fvtt-malefices .window-app.sheet .window-content .sheet-body{
font-size: 0.8rem; font-size: 0.8rem;
/*background: url("../images/ui/pc_sheet_bg.webp") repeat left top;*/ /*background: url("../images/ui/pc_sheet_bg.webp") repeat left top;*/
background: url("../images/ui/background_01_clear.webp"); background: url("../images/ui/background_01_clear.webp");
@ -460,7 +465,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
padding: 0; padding: 0;
} }
.sheet nav.sheet-tabs { .malefices-actor-sheet nav.sheet-tabs {
font-size: 1.2rem; font-size: 1.2rem;
font-weight: bold; font-weight: bold;
height: 3rem; height: 3rem;
@ -476,7 +481,16 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
color:beige; color:beige;
} }
/* background: rgb(245,245,240) url("../images/ui/fond4.webp") repeat left top;*/ /* Dice tray specific overrides */
.dice-tray button svg * {
fill: #6d5923 !important;
}
.dice-tray input[type="text"] {
color: #6d5923 !important;
}
.dice-tray button {
color: #6d5923 !important;
}
nav.sheet-tabs .item { nav.sheet-tabs .item {
position: relative; position: relative;
@ -490,7 +504,7 @@ nav.sheet-tabs .item:after {
right: 0; right: 0;
height: 2rem; height: 2rem;
width: 1px; width: 1px;
border-right: 1px dashed rgba(52, 52, 52, 0.25); /*border-right: 1px dashed rgba(52, 52, 52, 0.25);*/
} }
.sheet .tab[data-tab] { .sheet .tab[data-tab] {
@ -798,6 +812,9 @@ ul, li {
color: rgba(19, 18, 18, 0.95); color: rgba(19, 18, 18, 0.95);
} }
#sidebar .scene {
color: rgba(237, 240, 199, 0.95);
}
/* background: rgb(105,85,65) url("../images/ui/texture_feuille_perso_onglets.webp") no-repeat right bottom;*/ /* background: rgb(105,85,65) url("../images/ui/texture_feuille_perso_onglets.webp") no-repeat right bottom;*/
#sidebar.collapsed { #sidebar.collapsed {
@ -954,8 +971,6 @@ ul, li {
} }
#sidebar #sidebar-tabs i{ #sidebar #sidebar-tabs i{
width: 25px;
height: 25px;
display: inline-block; display: inline-block;
background-position:center; background-position:center;
background-size:cover; background-size:cover;

View File

@ -60,9 +60,8 @@
"license": "LICENSE.txt", "license": "LICENSE.txt",
"manifest": "https://www.uberwald.me/gitea/public/fvtt-malefices/raw/branch/master/system.json", "manifest": "https://www.uberwald.me/gitea/public/fvtt-malefices/raw/branch/master/system.json",
"compatibility": { "compatibility": {
"minimum": "10", "minimum": "11",
"verified": "10", "verified": "12"
"maximum": "10"
}, },
"id": "fvtt-malefices", "id": "fvtt-malefices",
"primaryTokenAttribute": "secondary.health", "primaryTokenAttribute": "secondary.health",
@ -73,7 +72,7 @@
], ],
"title": "Maléfices, le Jeu de Rôle", "title": "Maléfices, le Jeu de Rôle",
"url": "https://www.uberwald.me/gitea/public/fvtt-malefices", "url": "https://www.uberwald.me/gitea/public/fvtt-malefices",
"version": "10.1.1", "version": "12.0.1",
"download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.1.1.zip", "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v12.0.1.zip",
"background": "systems/fvtt-malefices/images/ui/malefice_welcome_page.webp" "background": "systems/fvtt-malefices/images/ui/malefice_welcome_page.webp"
} }

View File

@ -25,6 +25,7 @@
"religion": "", "religion": "",
"fantastique": "", "fantastique": "",
"description": "", "description": "",
"notes": "",
"gmnotes": "" "gmnotes": ""
} }
}, },
@ -132,7 +133,7 @@
"description": "" "description": ""
}, },
"arme": { "arme": {
"armetype": 0, "armetype": "",
"porteecourte": "", "porteecourte": "",
"porteemoyenne": "", "porteemoyenne": "",
"dommagenormale": 0, "dommagenormale": 0,

View File

@ -4,7 +4,11 @@
<header class="sheet-header"> <header class="sheet-header">
<div class="header-fields"> <div class="header-fields">
<div class="flexrow"> <div class="flexrow">
<div class="profile-img-container">
<img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" /> <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
</div>
<div class="flexcol"> <div class="flexcol">
<h1 class="charname margin-right"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1> <h1 class="charname margin-right"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
@ -335,7 +339,7 @@
<label class="item-field-label-medium">Sens</label> <label class="item-field-label-medium">Sens</label>
</span> </span>
<div class="item-controls item-controls-fixed"> <div class="item-controls item-controls-fixed">
<a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a> <a class="item-control item-add" data-type="tarot" title="Create Item"><i class="fas fa-plus"></i></a>
</div> </div>
</li> </li>
{{#each tarots as |tarot key|}} {{#each tarots as |tarot key|}}
@ -364,7 +368,7 @@
<label class="item-field-label-medium">Sens</label> <label class="item-field-label-medium">Sens</label>
</span> </span>
<div class="item-controls item-controls-fixed"> <div class="item-controls item-controls-fixed">
<a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a> <a class="item-control item-add" data-type="tarot" title="Create Item"><i class="fas fa-plus"></i></a>
</div> </div>
</li> </li>
{{#each tarotsCache as |tarot key|}} {{#each tarotsCache as |tarot key|}}
@ -392,8 +396,7 @@
<h3><label class="items-title-text">Background</label></h3> <h3><label class="items-title-text">Background</label></h3>
</span> </span>
<div class="form-group editor"> <div class="form-group editor">
{{editor description target="system.biodata.description" button=true owner=owner {{editor description target="system.biodata.description" button=true owner=owner editable=editable}}
editable=editable}}
</div> </div>
<hr> <hr>
<span class="item-name-label-header items-title-bg"> <span class="item-name-label-header items-title-bg">

View File

@ -28,7 +28,7 @@
{{#if isSuccess}} {{#if isSuccess}}
<li><label class="chat-result-text chat-result-success ">Réussite !</label> Votre {{attr.label}} augmente de {{gainAttr}} points.</li> <li><label class="chat-result-text chat-result-success ">Réussite !</label> Votre {{attr.label}} augmente de {{gainAttr}} points.</li>
{{else}} {{else}}
<li><label class="chat-result-text chat-result-success ">Echec !</label> Votre {{attr.label}} diminue de {{gainAttr}} points.</li> <li><label class="chat-result-text chat-result-failure ">Echec !</label> Votre {{attr.label}} diminue de {{gainAttr}} points.</li>
{{/if}} {{/if}}
</ul> </ul>

View File

@ -33,25 +33,25 @@
<li><label class="chat-result-text chat-result-success ">Réussite Critique !</label></li> <li><label class="chat-result-text chat-result-success ">Réussite Critique !</label></li>
{{#if arme}} {{#if arme}}
{{#if arme.system.dommagecritiquemort}} {{#if arme.system.dommagecritiquemort}}
<li><label class="chat-result-text chat-result-success">La victime est morte !</label></li> <li><label class="chat-result-success">La victime est morte !</label></li>
{{else}} {{else}}
{{#if arme.system.dommagecritiqueko}} {{#if arme.system.dommagecritiqueko}}
<li><label class="chat-result-text chat-result-success ">La victime est KO !</label></li> <li><label class="chat-result-text chat-result-success ">La victime est KO !</label></li>
{{/if}} {{/if}}
<li><label class="chat-result-text chat-result-success ">La victime subit {{arme.system.dommagecritique}} dommages</label></li> <li><label class="chat-result-success ">La victime subit {{arme.system.dommagecritique}} dommages</label></li>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{else}} {{else}}
{{#if isPart}} {{#if isPart}}
<li><label class="chat-result-text chat-result-success ">Réussite Particulière !</label></li> <li><label class="chat-result-text chat-result-success ">Réussite Particulière !</label></li>
{{#if arme}} {{#if arme}}
<li><label class="chat-result-text chat-result-success ">La victime subit {{arme.system.dommagepart}} dommages</label></li> <li><label class="chat-result-success ">La victime subit {{arme.system.dommagepart}} dommages</label></li>
{{/if}} {{/if}}
{{else}} {{else}}
<li><label class="chat-result-text chat-result-success ">Succés !</label></li> <li><label class="chat-result-text chat-result-success ">Succés !</label></li>
{{#if arme}} {{#if arme}}
<li><label class="chat-result-text chat-result-success ">La victime subit {{arme.system.dommagenormale}} dommages</label></li> <li><label class="chat-result-success ">La victime subit {{arme.system.dommagenormale}} dommages</label></li>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{/if}} {{/if}}

View File

@ -18,25 +18,14 @@
<div class="flexrow"> <div class="flexrow">
<span class="roll-dialog-label">Degré de la confrontation : </span> <span class="roll-dialog-label">Degré de la confrontation : </span>
<select id="confrontationDegre" name="confrontationDegre"> <select id="confrontationDegre" name="confrontationDegre">
{{#select confrontationDegre}} {{selectOptions config.confrontationDegreOptions selected=confrontationDegre}}
<option value="0">0</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
{{/select}}
</select> </select>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<span class="roll-dialog-label">Modificateur de confrontation : </span> <span class="roll-dialog-label">Modificateur de confrontation : </span>
<select id="confrontationModif" name="confrontationModif"> <select id="confrontationModif" name="confrontationModif">
{{#select confrontationModif}} {{selectOptions config.confrontationModifOptions selected=confrontationModif}}
<option value="-1">-1</option>
<option value="0">0</option>
<option value="1">+1</option>
{{/select}}
</select> </select>
</div> </div>

View File

@ -36,30 +36,14 @@
<div class="flexrow"> <div class="flexrow">
<span class="roll-dialog-label">Bonus/Malus biographique : </span> <span class="roll-dialog-label">Bonus/Malus biographique : </span>
<select id="bonusMalusPerso" name="bonusMalusPerso"> <select id="bonusMalusPerso" name="bonusMalusPerso">
{{#select bonusMalusPerso}} {{selectOptions config.bonusMalusPersoOptions selected=bonusMalusPerso nameAttr="value" labelAttr="label"}}
<option value="-3">-3</option>
<option value="-2">-2</option>
<option value="-1">-1</option>
<option value="0">0</option>
<option value="1">+1</option>
<option value="2">+2</option>
<option value="3">+3</option>
{{/select}}
</select> </select>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<span class="roll-dialog-label">Bonus/Malus de situation : </span> <span class="roll-dialog-label">Bonus/Malus de situation : </span>
<select id="bonusMalusSituation" name="bonusMalusSituation"> <select id="bonusMalusSituation" name="bonusMalusSituation">
{{#select bonusMalusSituation}} {{selectOptions config.bonusMalusPersoOptions selected=bonusMalusSituation nameAttr="value" labelAttr="label"}}
<option value="-3">-3</option>
<option value="-2">-2</option>
<option value="-1">-1</option>
<option value="0">0</option>
<option value="1">+1</option>
<option value="2">+2</option>
<option value="3">+3</option>
{{/select}}
</select> </select>
</div> </div>
@ -67,23 +51,14 @@
<div class="flexrow"> <div class="flexrow">
<span class="roll-dialog-label">Défense : </span> <span class="roll-dialog-label">Défense : </span>
<select id="bonusMalusDef" name="bonusMalusDef"> <select id="bonusMalusDef" name="bonusMalusDef">
{{#select bonusMalusDef}} {{selectOptions config.bonusMalusDefOptions selected=bonusMalusDef nameAttr="value" labelAttr="label"}}
<option value="-3">-6 (réussite critique)</option>
<option value="-3">-3 (réussite)</option>
<option value="0">0 (echec ou pas d'esquive)</option>
<option value="3">+3 (echec critique)</option>
{{/select}}
</select> </select>
</div> </div>
<div class="flexrow"> <div class="flexrow">
<span class="roll-dialog-label">Portée : </span> <span class="roll-dialog-label">Portée : </span>
<select id="bonusMalusPortee" name="bonusMalusPortee"> <select id="bonusMalusPortee" name="bonusMalusPortee">
{{#select bonusMalusPortee}} {{selectOptions config.bonusMalusPorteeOptions selected=bonusMalusPortee nameAttr="value" labelAttr="label"}}
<option value="1">+1 (Portée courte)</option>
<option value="0">0 (Portée moyenne)</option>
<option value="-1">-1 (Portée longue)</option>
{{/select}}
</select> </select>
</div> </div>
{{/if}} {{/if}}

View File

@ -20,12 +20,8 @@
<ul> <ul>
<li class="flexrow"> <li class="flexrow">
<label class="item-field-label-long">Lame tutélaire</label> <label class="item-field-label-long">Lame tutélaire</label>
<select class="item-field-label-long" type="text" name="system.lametutelaire" value="{{system.lametutelaire}}" data-dtype="String"> <select class="item-field-label-long" type="text" name="system.lametutelaire" data-dtype="String">
{{#select system.lametutelaire}} {{selectOptions tarots selected=system.lametutelaire nameAttr="_id" labelAttr="name"}}
{{#each tarots as |carte key| }}
<option value="{{carte._id}}">{{carte.name}}</option>
{{/each}}
{{/select}}
</select> </select>
</li> </li>

View File

@ -22,11 +22,7 @@
<li class="flexrow"> <li class="flexrow">
<label class="item-field-label-long">Type d'arme</label> <label class="item-field-label-long">Type d'arme</label>
<select class="item-field-label-long" type="text" name="system.armetype" value="{{system.armetype}}" data-dtype="String"> <select class="item-field-label-long" type="text" name="system.armetype" value="{{system.armetype}}" data-dtype="String">
{{#select system.armetype}} {{selectOptions config.armeTypes selected=system.armetype}}
{{#each config.armeTypes as |type key| }}
<option value="{{key}}">{{type}}</option>
{{/each}}
{{/select}}
</select> </select>
</li> </li>

View File

@ -26,11 +26,7 @@
<li class="flexrow"> <li class="flexrow">
<label class="item-field-label-long">Type </label> <label class="item-field-label-long">Type </label>
<select class="item-field-label-long" type="text" name="system.tarottype" value="{{system.tarottype}}" data-dtype="String"> <select class="item-field-label-long" type="text" name="system.tarottype" value="{{system.tarottype}}" data-dtype="String">
{{#select system.tarottype}} {{selectOptions config.tarotType selected=system.tarottype}}
{{#each config.tarotType as |type key| }}
<option value="{{key}}">{{type}}</option>
{{/each}}
{{/select}}
</select> </select>
</li> </li>