diff --git a/fonts/IMFellGreatPrimer-Italic.ttf b/fonts/IMFellGreatPrimer-Italic.ttf new file mode 100644 index 0000000..fabd869 Binary files /dev/null and b/fonts/IMFellGreatPrimer-Italic.ttf differ diff --git a/fonts/IMFellGreatPrimer-Regular.ttf b/fonts/IMFellGreatPrimer-Regular.ttf new file mode 100644 index 0000000..ecba387 Binary files /dev/null and b/fonts/IMFellGreatPrimer-Regular.ttf differ diff --git a/fonts/IM_FELL_Great_Primer_Roman.woff b/fonts/IM_FELL_Great_Primer_Roman.woff new file mode 100644 index 0000000..a0b273b Binary files /dev/null and b/fonts/IM_FELL_Great_Primer_Roman.woff differ diff --git a/gulpfile.js b/gulpfile.js index 4c748fd..edb8a9c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,7 +3,7 @@ var gulp = require('gulp'); var postcss = require('gulp-postcss'); var autoprefixer = require('autoprefixer'); -var cssnext = require('cssnext'); +var cssnext = require('postcss-preset-env'); var precss = require('precss'); gulp.task('css', function () { diff --git a/modules/actors/tedeum-actor-sheet.js b/modules/actors/tedeum-actor-sheet.js index 8eb5c99..7922afe 100644 --- a/modules/actors/tedeum-actor-sheet.js +++ b/modules/actors/tedeum-actor-sheet.js @@ -38,11 +38,12 @@ export class TeDeumActorPJSheet extends ActorSheet { competences: this.actor.getCompetences(), config: duplicate(game.system.tedeum.config), armes: this.actor.getArmes(), - equipments: this.actor.getEquipments(), - subActors: duplicate(this.actor.getSubActors()), + caracList: this.actor.prepareCaracteristiques(), + providence: this.actor.prepareProvidence(), + arbreCompetences: this.actor.prepareArbreCompetences(), + equipements: this.actor.getEquipements(), description: await TextEditor.enrichHTML(this.object.system.description, { async: true }), notes: await TextEditor.enrichHTML(this.object.system.notes, { async: true }), - equipementlibre: await TextEditor.enrichHTML(this.object.system.equipementlibre, { async: true }), options: this.options, owner: this.document.isOwner, editScore: this.options.editScore, diff --git a/modules/actors/tedeum-actor.js b/modules/actors/tedeum-actor.js index 3872c9f..acf0870 100644 --- a/modules/actors/tedeum-actor.js +++ b/modules/actors/tedeum-actor.js @@ -97,6 +97,56 @@ export class TeDeumActor extends Actor { TeDeumUtility.sortArrayObjectsByName(comp) return comp; } + + /* -------------------------------------------- */ + updateCarac(c, key) { + c.name = game.system.tedeum.config.caracteristiques[key].label + c.generalqualite = game.system.tedeum.config.descriptionValeur[c.value].qualite + c.qualite = game.system.tedeum.config.descriptionValeur[c.value][key] + c.dice = game.system.tedeum.config.descriptionValeur[c.value].dice + c.negativeDice = game.system.tedeum.config.descriptionValeur[c.value].negativeDice + } + + /* -------------------------------------------- */ + prepareCaracteristiques() { + let carac = foundry.utils.deepClone(this.system.caracteristiques) + for (let key in carac) { + let c = carac[key] + this.updateCarac(c, key) + } + return carac + } + /* -------------------------------------------- */ + prepareProvidence() { + let providence = foundry.utils.deepClone(this.system.providence) + providence.name = "Providence" + providence.qualite = game.system.tedeum.config.providence[providence.value].labelM + providence.dice = game.system.tedeum.config.providence[providence.value].diceValue + return providence + } + + /* -------------------------------------------- */ + filterCompetencesByCarac(key) { + let comp = this.items.filter(item => item.type == 'competence' && item.system.caracteristique == key) + comp.forEach(c => { + if (c.system.isBase) { + c.system.score = this.system.caracteristiques[c.system.caracteristique].value + } + }) + return foundry.utils.deepClone( comp || {} ) + } + + /* -------------------------------------------- */ + prepareArbreCompetences() { + let arbre = foundry.utils.deepClone(this.system.caracteristiques) + for (let key in arbre) { + let c = arbre[key] + this.updateCarac(c, key) + c.competences = this.filterCompetencesByCarac(key) + } + return arbre + } + /* -------------------------------------------- */ getItemById(id) { let item = this.items.find(item => item.id == id); @@ -193,31 +243,6 @@ export class TeDeumActor extends Actor { return init + (subValue.total / 100) } - /* -------------------------------------------- */ - getSubActors() { - let subActors = []; - for (let id of this.system.subactors) { - subActors.push(duplicate(game.actors.get(id))) - } - return subActors; - } - /* -------------------------------------------- */ - async addSubActor(subActorId) { - let subActors = duplicate(this.system.subactors); - subActors.push(subActorId); - await this.update({ 'system.subactors': subActors }); - } - /* -------------------------------------------- */ - async delSubActor(subActorId) { - let newArray = []; - for (let id of this.system.subactors) { - if (id != subActorId) { - newArray.push(id); - } - } - await this.update({ 'system.subactors': newArray }); - } - /* -------------------------------------------- */ async deleteAllItemsByType(itemType) { let items = this.items.filter(item => item.type == itemType); diff --git a/modules/common/tedeum-config.js b/modules/common/tedeum-config.js index 367a65c..1ba1768 100644 --- a/modules/common/tedeum-config.js +++ b/modules/common/tedeum-config.js @@ -35,18 +35,18 @@ export const TEDEUM_CONFIG = { }, descriptionValeur: { - 1: { qualite: "Mauvais", dice: "d4", negativeDice: "d20", savoir: "Sot", sensibilite: "Obtus", entregent: "Rustaud", puissance: "Menu", complexion: "Anémique", adresse: "Empesé" }, - 2: { qualite: "Médiocre", dice: "d6", negativeDice: "d12", savoir: "Limité", sensibilite: "Etriqué", entregent: "Frustre", puissance: "Délicat", complexion: "Languide", adresse: "Gauche" }, - 3: { qualite: "Correct", dice: "d8", negativeDice: "d10", savoir: "Mêlé", sensibilite: "Ouvert", entregent: "Badin", puissance: "Membru", complexion: "Dispos", adresse: "Ingambe" }, - 4: { qualite: "Bon", dice: "d10", negativeDice: "d8", savoir: "Lettré", sensibilite: "Fin", entregent: "Disert", puissance: "Vigoureux", complexion: "Gaillard", adresse: "Leste" }, - 5: { qualite: "Bon", dice: "d10", negativeDice: "d8", savoir: "Lettré", sensibilite: "Fin", entregent: "Disert", puissance: "Vigoureux", complexion: "Gaillard", adresse: "Leste" }, - 6: { qualite: "Bon", dice: "d10", negativeDice: "d8", savoir: "Lettré", sensibilite: "Fin", entregent: "Disert", puissance: "Vigoureux", complexion: "Gaillard", adresse: "Leste" }, - 7: { qualite: "Excellent", dice: "d12", negativeDice: "d6", savoir: "Docte", sensibilite: "Subtil", entregent: "Galant", puissance: "Musculeux", complexion: "Sanguin", adresse: "Preste" }, - 8: { qualite: "Excellent", dice: "d12", negativeDice: "d6", savoir: "Docte", sensibilite: "Subtil", entregent: "Galant", puissance: "Musculeux", complexion: "Sanguin", adresse: "Preste" }, - 9: { qualite: "Excellent", dice: "d12", negativeDice: "d6", savoir: "Docte", sensibilite: "Subtil", entregent: "Galant", puissance: "Musculeux", complexion: "Sanguin", adresse: "Preste" }, - 10: { qualite: "Excellent", dice: "d12", negativeDice: "d6", savoir: "Docte", sensibilite: "Subtil", entregent: "Galant", puissance: "Musculeux", complexion: "Sanguin", adresse: "Preste" }, - 11: { qualite: "Excellent", dice: "d12", negativeDice: "d6", savoir: "Docte", sensibilite: "Subtil", entregent: "Galant", puissance: "Musculeux", complexion: "Sanguin", adresse: "Preste" }, - 12: { qualite: "Admirabme", dice: "d20", negativeDice: "d4", savoir: "Humaniste", sensibilite: "Spirituel", entregent: "Sémillant", puissance: "Hercule", complexion: "Aguerri", adresse: "Alerte" }, + 1: { valeur: 1, qualite: "Mauvais", dice: "d4", negativeDice: "d20", savoir: "Sot", sensibilite: "Obtus", entregent: "Rustaud", puissance: "Menu", complexion: "Anémique", adresse: "Empesé" }, + 2: { valeur: 2, qualite: "Médiocre", dice: "d6", negativeDice: "d12", savoir: "Limité", sensibilite: "Etriqué", entregent: "Frustre", puissance: "Délicat", complexion: "Languide", adresse: "Gauche" }, + 3: { valeur: 3, qualite: "Correct", dice: "d8", negativeDice: "d10", savoir: "Mêlé", sensibilite: "Ouvert", entregent: "Badin", puissance: "Membru", complexion: "Dispos", adresse: "Ingambe" }, + 4: { valeur: 4, qualite: "Bon", dice: "d10", negativeDice: "d8", savoir: "Lettré", sensibilite: "Fin", entregent: "Disert", puissance: "Vigoureux", complexion: "Gaillard", adresse: "Leste" }, + 5: { valeur: 5, qualite: "Bon", dice: "d10", negativeDice: "d8", savoir: "Lettré", sensibilite: "Fin", entregent: "Disert", puissance: "Vigoureux", complexion: "Gaillard", adresse: "Leste" }, + 6: { valeur: 6, qualite: "Bon", dice: "d10", negativeDice: "d8", savoir: "Lettré", sensibilite: "Fin", entregent: "Disert", puissance: "Vigoureux", complexion: "Gaillard", adresse: "Leste" }, + 7: { valeur: 7, qualite: "Excellent", dice: "d12", negativeDice: "d6", savoir: "Docte", sensibilite: "Subtil", entregent: "Galant", puissance: "Musculeux", complexion: "Sanguin", adresse: "Preste" }, + 8: { valeur: 8, qualite: "Excellent", dice: "d12", negativeDice: "d6", savoir: "Docte", sensibilite: "Subtil", entregent: "Galant", puissance: "Musculeux", complexion: "Sanguin", adresse: "Preste" }, + 9: { valeur: 9, qualite: "Excellent", dice: "d12", negativeDice: "d6", savoir: "Docte", sensibilite: "Subtil", entregent: "Galant", puissance: "Musculeux", complexion: "Sanguin", adresse: "Preste" }, + 10: { valeur: 10, qualite: "Excellent", dice: "d12", negativeDice: "d6", savoir: "Docte", sensibilite: "Subtil", entregent: "Galant", puissance: "Musculeux", complexion: "Sanguin", adresse: "Preste" }, + 11: { valeur: 11, qualite: "Excellent", dice: "d12", negativeDice: "d6", savoir: "Docte", sensibilite: "Subtil", entregent: "Galant", puissance: "Musculeux", complexion: "Sanguin", adresse: "Preste" }, + 12: { valeur: 12, qualite: "Admirable", dice: "d20", negativeDice: "d4", savoir: "Humaniste", sensibilite: "Spirituel", entregent: "Sémillant", puissance: "Hercule", complexion: "Aguerri", adresse: "Alerte" }, }, degatsArmure : { diff --git a/modules/common/tedeum-utility.js b/modules/common/tedeum-utility.js index 8c276c1..708b28e 100644 --- a/modules/common/tedeum-utility.js +++ b/modules/common/tedeum-utility.js @@ -160,16 +160,10 @@ export class TeDeumUtility { /* -------------------------------------------- */ static async preloadHandlebarsTemplates() { - console.log("PRELOAD >>>>>") const templatePaths = [ 'systems/fvtt-te-deum/templates/actors/editor-notes-gm.hbs', 'systems/fvtt-te-deum/templates/items/partial-item-nav.hbs', - 'systems/fvtt-te-deum/templates/items/partial-item-equipment.hbs', - 'systems/fvtt-te-deum/templates/items/partial-item-description.hbs', - 'systems/fvtt-te-deum/templates/dialogs/partial-common-roll-dialog.hbs', - 'systems/fvtt-te-deum/templates/dialogs/partial-confront-dice-area.hbs', - 'systems/fvtt-te-deum/templates/dialogs/partial-confront-bonus-area.hbs', - 'systems/fvtt-te-deum/templates/actors/partial-impacts.hbs', + 'systems/fvtt-te-deum/templates/items/partial-item-description.hbs' ] return loadTemplates(templatePaths); } diff --git a/modules/data/tedeum-schema-competence.js b/modules/data/tedeum-schema-competence.js index 09d10b4..fca1be1 100644 --- a/modules/data/tedeum-schema-competence.js +++ b/modules/data/tedeum-schema-competence.js @@ -12,4 +12,4 @@ export class TeDeumCompetenceSchema extends foundry.abstract.TypeDataModel { return schema; } -} +} \ No newline at end of file diff --git a/modules/data/tedeum-schema-pj.js b/modules/data/tedeum-schema-pj.js index 0cc4aa2..bca68db 100644 --- a/modules/data/tedeum-schema-pj.js +++ b/modules/data/tedeum-schema-pj.js @@ -5,8 +5,8 @@ export class TeDeumPJSchema extends foundry.abstract.TypeDataModel { const schema = {}; schema.caracteristiques = new fields.SchemaField( - Object.values(SYSTEM.caracteristiques).reduce((obj, caracDef) => { - obj[caracDef.id] =new fields.SchemaField({ + Object.values(game.system.tedeum.config.caracteristiques).reduce((obj, caracDef) => { + obj[caracDef.id] = new fields.SchemaField({ value: new fields.NumberField({ ...requiredInteger, initial: 1, min: 1, max: 12 }), experience: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0, max: 10000 }), }); @@ -22,7 +22,7 @@ export class TeDeumPJSchema extends foundry.abstract.TypeDataModel { }); schema.localisation = new fields.SchemaField( - Object.values(LOCALISATION).reduce((obj, loc) => { + Object.values(game.system.tedeum.config.LOCALISATION).reduce((obj, loc) => { obj[loc.id] =new fields.SchemaField({ blessures: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0, max: 20 }) }); @@ -40,9 +40,11 @@ export class TeDeumPJSchema extends foundry.abstract.TypeDataModel { schema.description = new fields.HTMLField({required: true, blank: true}); schema.connaissances = new fields.HTMLField({required: true, blank: true}); schema.vetements = new fields.HTMLField({required: true, blank: true}); + schema.descriptiongraces = new fields.HTMLField({required: true, blank: true}); schema.genre = new fields.StringField({required: true, choices: ["Homme", "Femme"], initial: "Femme"}); schema.age = new fields.StringField({ required: false, blank: true, initial: undefined }); - schema.origine = new fields.StringField({ required: false, blank: true, initial: undefined }); + schema.statutocial = new fields.StringField({ required: false, blank: true, initial: undefined }); + schema.chargestitre = new fields.StringField({ required: false, blank: true, initial: undefined }); schema.charges = new fields.StringField({ required: false, blank: true, initial: undefined }); return schema; diff --git a/packs/competences/000016.log b/packs/competences/000023.log similarity index 100% rename from packs/competences/000016.log rename to packs/competences/000023.log diff --git a/packs/competences/CURRENT b/packs/competences/CURRENT index 23b73d9..5af92b2 100644 --- a/packs/competences/CURRENT +++ b/packs/competences/CURRENT @@ -1 +1 @@ -MANIFEST-000014 +MANIFEST-000022 diff --git a/packs/competences/LOG b/packs/competences/LOG index f5918a3..4bd0d55 100644 --- a/packs/competences/LOG +++ b/packs/competences/LOG @@ -1,8 +1,3 @@ -2024/02/29-22:27:55.155956 7fd55ce006c0 Recovering log #12 -2024/02/29-22:27:55.166972 7fd55ce006c0 Delete type=3 #10 -2024/02/29-22:27:55.167027 7fd55ce006c0 Delete type=0 #12 -2024/02/29-22:28:38.447774 7fd555a006c0 Level-0 table #17: started -2024/02/29-22:28:38.447798 7fd555a006c0 Level-0 table #17: 0 bytes OK -2024/02/29-22:28:38.454343 7fd555a006c0 Delete type=0 #15 -2024/02/29-22:28:38.463769 7fd555a006c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) -2024/02/29-22:28:38.463797 7fd555a006c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/05/06-06:55:13.182706 7f87a4a006c0 Recovering log #20 +2024/05/06-06:55:13.193417 7f87a4a006c0 Delete type=3 #18 +2024/05/06-06:55:13.193524 7f87a4a006c0 Delete type=0 #20 diff --git a/packs/competences/LOG.old b/packs/competences/LOG.old index ce64bcd..4cd5e4c 100644 --- a/packs/competences/LOG.old +++ b/packs/competences/LOG.old @@ -1,8 +1,8 @@ -2024/02/29-22:04:33.948367 7fd557e006c0 Recovering log #8 -2024/02/29-22:04:33.960203 7fd557e006c0 Delete type=3 #6 -2024/02/29-22:04:33.960295 7fd557e006c0 Delete type=0 #8 -2024/02/29-22:27:52.990776 7fd555a006c0 Level-0 table #13: started -2024/02/29-22:27:52.990820 7fd555a006c0 Level-0 table #13: 0 bytes OK -2024/02/29-22:27:53.023567 7fd555a006c0 Delete type=0 #11 -2024/02/29-22:27:53.023779 7fd555a006c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) -2024/02/29-22:27:53.023803 7fd555a006c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/05/05-20:14:18.376388 7f87a54006c0 Recovering log #16 +2024/05/05-20:14:18.386554 7f87a54006c0 Delete type=3 #14 +2024/05/05-20:14:18.386658 7f87a54006c0 Delete type=0 #16 +2024/05/05-22:07:39.129357 7f879e4006c0 Level-0 table #21: started +2024/05/05-22:07:39.129390 7f879e4006c0 Level-0 table #21: 0 bytes OK +2024/05/05-22:07:39.175466 7f879e4006c0 Delete type=0 #19 +2024/05/05-22:07:39.175815 7f879e4006c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/05/05-22:07:39.175892 7f879e4006c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) diff --git a/packs/competences/MANIFEST-000014 b/packs/competences/MANIFEST-000014 deleted file mode 100644 index 0076553..0000000 Binary files a/packs/competences/MANIFEST-000014 and /dev/null differ diff --git a/packs/competences/MANIFEST-000022 b/packs/competences/MANIFEST-000022 new file mode 100644 index 0000000..cc74f91 Binary files /dev/null and b/packs/competences/MANIFEST-000022 differ diff --git a/packs/equipment/000078.log b/packs/equipment/000085.log similarity index 100% rename from packs/equipment/000078.log rename to packs/equipment/000085.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index f24fe8e..bdbe58e 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000076 +MANIFEST-000084 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index b9cf3ff..b565d0d 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,7 +1,3 @@ -2024/02/29-22:27:55.142370 7fd557e006c0 Recovering log #74 -2024/02/29-22:27:55.153628 7fd557e006c0 Delete type=3 #72 -2024/02/29-22:27:55.153680 7fd557e006c0 Delete type=0 #74 -2024/02/29-22:28:38.441598 7fd555a006c0 Level-0 table #79: started -2024/02/29-22:28:38.441626 7fd555a006c0 Level-0 table #79: 0 bytes OK -2024/02/29-22:28:38.447661 7fd555a006c0 Delete type=0 #77 -2024/02/29-22:28:38.454433 7fd555a006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/05/06-06:55:13.169191 7f879fe006c0 Recovering log #82 +2024/05/06-06:55:13.180412 7f879fe006c0 Delete type=3 #80 +2024/05/06-06:55:13.180524 7f879fe006c0 Delete type=0 #82 diff --git a/packs/equipment/LOG.old b/packs/equipment/LOG.old index b187cae..8f421f8 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,7 +1,7 @@ -2024/02/29-22:04:33.935165 7fd556a006c0 Recovering log #70 -2024/02/29-22:04:33.945327 7fd556a006c0 Delete type=3 #68 -2024/02/29-22:04:33.945415 7fd556a006c0 Delete type=0 #70 -2024/02/29-22:27:52.954004 7fd555a006c0 Level-0 table #75: started -2024/02/29-22:27:52.954056 7fd555a006c0 Level-0 table #75: 0 bytes OK -2024/02/29-22:27:52.990626 7fd555a006c0 Delete type=0 #73 -2024/02/29-22:27:53.023766 7fd555a006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/05/05-20:14:18.363805 7f879f4006c0 Recovering log #78 +2024/05/05-20:14:18.374315 7f879f4006c0 Delete type=3 #76 +2024/05/05-20:14:18.374420 7f879f4006c0 Delete type=0 #78 +2024/05/05-22:07:39.092489 7f879e4006c0 Level-0 table #83: started +2024/05/05-22:07:39.092519 7f879e4006c0 Level-0 table #83: 0 bytes OK +2024/05/05-22:07:39.129220 7f879e4006c0 Delete type=0 #81 +2024/05/05-22:07:39.175791 7f879e4006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000076 b/packs/equipment/MANIFEST-000076 deleted file mode 100644 index 53bea8f..0000000 Binary files a/packs/equipment/MANIFEST-000076 and /dev/null differ diff --git a/packs/equipment/MANIFEST-000084 b/packs/equipment/MANIFEST-000084 new file mode 100644 index 0000000..6044d19 Binary files /dev/null and b/packs/equipment/MANIFEST-000084 differ diff --git a/postcss/tedeum.css b/postcss/tedeum.css index 707de6a..b6f8de3 100644 --- a/postcss/tedeum.css +++ b/postcss/tedeum.css @@ -3,7 +3,11 @@ font-family: "MailartRubberstamp"; src: url('../fonts/MailartRubberstamp-Regular.woff') format("woff"); } - + @font-face { + font-family: "GreatPrimer"; + src: url('../fonts/IM_FELL_Great_Primer_Roman.woff') format("woff"); + } + :root { /* =================== 1. ACTOR SHEET FONT STYLES =========== */ --window-header-title-font-size: 1.3rem; @@ -63,6 +67,7 @@ .window-app.sheet .window-content { margin: 0; padding: 0; + font-family: "GreatPrimer"; } .strong-text{ font-weight: bold; @@ -285,7 +290,7 @@ table {border: 1px solid #7a7971;} } .fvtt-te-deum .sheet-header h1.charname input { - font-family: MailartRubberstamp; + font-family: "MailartRubberstamp"; font-size: 3rem; width: 100%; height: 100%; @@ -296,7 +301,7 @@ table {border: 1px solid #7a7971;} -webkit-box-flex: 0; -ms-flex: 0; flex: 0; - font-family: MailartRubberstamp; + font-family: "MailartRubberstamp"; font-size: 2.2rem; } @@ -305,6 +310,7 @@ table {border: 1px solid #7a7971;} .fvtt-te-deum .sheet-body .tab .editor { height: 100%; font-size: 0.8rem; + font-family: "GreatPrimer"; } .editor { @@ -343,6 +349,7 @@ table {border: 1px solid #7a7971;} border-top: 1px solid #AAA; border-bottom: 1px solid #AAA; color: #000000; + font-family: "GreatPrimer"; } .fvtt-te-deum .tabs .item { @@ -641,6 +648,13 @@ ul, li { flex-grow: 0; } +.comp-column-list { + column-count: 4; +} +.comp-li { + max-width: 6rem; + width: 6rem; +} .description-label { flex-grow: 2; margin-left: 4px; @@ -1044,42 +1058,6 @@ ul, li { border-image-outset: 0px; } -/* Tooltip container */ -.tooltip { - position: relative; - display: inline-block; - /*border-bottom: 1px dotted black; /* If you want dots under the hoverable text */ -} - -/* Tooltip text */ -.tooltip .tooltiptext { - text-align: left; - background: rgba(231, 229, 226, 0.9); - width: 150px; - padding: 3px 0; - font-size: 0.9rem; - - /* Position the tooltip text */ - top: 1px; - position: absolute; - z-index: 1; - - /* Fade in tooltip */ - visibility: hidden; - opacity: 0; - transition: opacity 0.3s; -} - - -.tooltip-nobottom { - border-bottom: unset; /* If you want dots under the hoverable text */ -} - -/* Show the tooltip text when you mouse over the tooltip container */ -.tooltip:hover .tooltiptext { - visibility: visible; - opacity: 1; -} .chat-card-button { box-shadow: inset 0px 1px 0px 0px #a6827e; diff --git a/styles/tedeum.css b/styles/tedeum.css index 4e16322..ce7ebc6 100644 --- a/styles/tedeum.css +++ b/styles/tedeum.css @@ -3,7 +3,11 @@ font-family: "MailartRubberstamp"; src: url('../fonts/MailartRubberstamp-Regular.woff') format("woff"); } - + @font-face { + font-family: "GreatPrimer"; + src: url('../fonts/IM_FELL_Great_Primer_Roman.woff') format("woff"); + } + :root { /* =================== 1. ACTOR SHEET FONT STYLES =========== */ --window-header-title-font-size: 1.3rem; @@ -63,6 +67,7 @@ .window-app.sheet .window-content { margin: 0; padding: 0; + font-family: "GreatPrimer"; } .strong-text{ font-weight: bold; @@ -96,6 +101,7 @@ table {border: 1px solid #7a7971;} grid-column: span 2 / span 2; grid-template-columns: repeat(2, minmax(0, 1fr)); grid-gap: 10px; + grid-gap: 10px; gap: 10px; margin: 10px 0; padding: 0; @@ -260,7 +266,7 @@ table {border: 1px solid #7a7971;} } .fvtt-te-deum .sheet-header h1.charname input { - font-family: MailartRubberstamp; + font-family: "MailartRubberstamp"; font-size: 3rem; width: 100%; height: 100%; @@ -269,7 +275,7 @@ table {border: 1px solid #7a7971;} .fvtt-te-deum .sheet-tabs { flex: 0; - font-family: MailartRubberstamp; + font-family: "MailartRubberstamp"; font-size: 2.2rem; } @@ -278,6 +284,7 @@ table {border: 1px solid #7a7971;} .fvtt-te-deum .sheet-body .tab .editor { height: 100%; font-size: 0.8rem; + font-family: "GreatPrimer"; } .editor { @@ -316,6 +323,7 @@ table {border: 1px solid #7a7971;} border-top: 1px solid #AAA; border-bottom: 1px solid #AAA; color: #000000; + font-family: "GreatPrimer"; } .fvtt-te-deum .tabs .item { @@ -612,6 +620,14 @@ ul, li { flex-grow: 0; } +.comp-column-list { + -moz-column-count: 4; + column-count: 4; +} +.comp-li { + max-width: 6rem; + width: 6rem; +} .description-label { flex-grow: 2; margin-left: 4px; @@ -1024,42 +1040,6 @@ ul, li { border-image-outset: 0px; } -/* Tooltip container */ -.tooltip { - position: relative; - display: inline-block; - /*border-bottom: 1px dotted black; /* If you want dots under the hoverable text */ -} - -/* Tooltip text */ -.tooltip .tooltiptext { - text-align: left; - background: rgba(231, 229, 226, 0.9); - width: 150px; - padding: 3px 0; - font-size: 0.9rem; - - /* Position the tooltip text */ - top: 1px; - position: absolute; - z-index: 1; - - /* Fade in tooltip */ - visibility: hidden; - opacity: 0; - transition: opacity 0.3s; -} - - -.tooltip-nobottom { - border-bottom: unset; /* If you want dots under the hoverable text */ -} - -/* Show the tooltip text when you mouse over the tooltip container */ -.tooltip:hover .tooltiptext { - visibility: visible; - opacity: 1; -} .chat-card-button { box-shadow: inset 0px 1px 0px 0px #a6827e; diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index 1bc0014..b140cc0 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -13,32 +13,6 @@

-
@@ -50,77 +24,78 @@ {{!-- Sheet Tab Navigation --}} {{!-- Sheet Body --}}
+ {{!-- Skills Tab --}} +
+ +
+
    + {{#each caracList as |char key|}} +
  • + + + + + +
    • + {{/each}} +
+ +
    +
  • + + + + +
    • +
  • + + + + +
    • +
+ +
+ +
+ {{!-- Skills Tab --}}
- -
- - {{#each skills as |category categkey|}} -
-
    -
  • - -

    -     -
    • - {{#each category.skilllist as |skill skillkey|}} -
  • - - - - - - - {{localize skill.name}} - - -
    • -
  • - + {{#each arbreCompetences as |carac key|}} +
      +
    • +

      {{carac.name}}

      + + + + +
      • +
        + {{#each carac.competences as |comp skillkey|}} +
      • + +
        • {{/each}} -
      -
- {{/each}} -
+ + + + {{/each}}
@@ -208,12 +183,6 @@
- {{> systems/fvtt-ecryme/templates/actors/partial-impacts.hbs impacts=system.impacts.physical - impacttype="physical" impactMalus=impactsMalus.physical}} - {{> systems/fvtt-ecryme/templates/actors/partial-impacts.hbs impacts=system.impacts.mental - impacttype="mental" impactMalus=impactsMalus.mental}} - {{> systems/fvtt-ecryme/templates/actors/partial-impacts.hbs impacts=system.impacts.social - impacttype="social" impactMalus=impactsMalus.social}}
- - - - {{!-- Sheet Tab Navigation --}} - - - {{!-- Sheet Body --}} -
- - {{#if hasCephaly}} - {{!-- Cephaly Tab --}} -
- -
- -
- -

{{localize "ECRY.ui.annency"}}

-
    -
  • - - {{localize "ECRY.ui.iscollective"}} - - - - {{localize "ECRY.ui.ismultiple"}} - - -
    • -
- -

{{localize "ECRY.ui.characters"}}

-
    - {{#each characters as |character id|}} -
  • - - {{character.name}} -
     
    -
    - - -
    -
    • - {{/each}} -
- -
- -
-

{{localize "ECRY.ui.location"}}

-
    - {{#each system.base.location as |location index|}} -
  • - - {{localize "ECRY.ui.location"}} {{index}} - - -
    • - {{/each}} -
  • - - {{localize "ECRY.ui.enhancements"}} - - -
    • -
-
- -
- -
- {{/if}} - - {{#if hasBoheme}} -
- -

{{localize "ECRY.ui.oniricform"}}

-
    -
  • - {{localize "ECRY.ui.name"}} - -
    • -
  • - {{localize "ECRY.ui.ideals"}} - -
    • -
  • - {{localize "ECRY.ui.politic"}} - -
    • -
  • - {{localize "ECRY.ui.description"}} - -
    • -
- -
- {{/if}} - - -
- \ No newline at end of file diff --git a/templates/actors/partial-impacts.hbs b/templates/actors/partial-impacts.hbs deleted file mode 100644 index 0da3375..0000000 --- a/templates/actors/partial-impacts.hbs +++ /dev/null @@ -1,17 +0,0 @@ -
- -
- -
- - -
\ No newline at end of file