diff --git a/lang/en.json b/lang/en.json index 3c511ef..3b0c8eb 100644 --- a/lang/en.json +++ b/lang/en.json @@ -155,7 +155,8 @@ "enhancements": "Enhancements", "oniricform": "Oniric shape (Boheme)", "ideals": "Ideals", - "politic": "Political ideal" + "politic": "Political ideal", + "boheme": "Boheme" } } } \ No newline at end of file diff --git a/lang/fr.json b/lang/fr.json index 1f7ddeb..465c1e2 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -156,7 +156,8 @@ "enhancements": "Améliorations", "oniricform": "Forme Onorique (Bohême)", "ideals": "Idéaux", - "politic": "Idéaux politiques" + "politic": "Idéaux politiques", + "boheme": "Bohême" } } } \ No newline at end of file diff --git a/modules/actors/ecryme-actor-sheet.js b/modules/actors/ecryme-actor-sheet.js index 21bac1f..92d1fcb 100644 --- a/modules/actors/ecryme-actor-sheet.js +++ b/modules/actors/ecryme-actor-sheet.js @@ -52,6 +52,7 @@ export class EcrymeActorSheet extends ActorSheet { hasAmertume: EcrymeUtility.hasAmertume(), cephalySkills: this.actor.getCephalySkills(), subActors: duplicate(this.actor.getSubActors()), + annency: this.actor.getAnnency(), 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 }), @@ -79,6 +80,12 @@ export class EcrymeActorSheet extends ActorSheet { if (e.keyCode === 13) return false; }); + html.find('.open-annency').click(ev => { + let actorId = $(ev.currentTarget).data("annency-id") + const actor = game.actors.get(actorId) + actor.sheet.render(true) + }) + // Update Inventory Item html.find('.item-edit').click(ev => { const li = $(ev.currentTarget).parents(".item") diff --git a/modules/actors/ecryme-actor.js b/modules/actors/ecryme-actor.js index b1568a7..658e30c 100644 --- a/modules/actors/ecryme-actor.js +++ b/modules/actors/ecryme-actor.js @@ -68,6 +68,31 @@ export class EcrymeActor extends Actor { return comp; } + + /* -------------------------------------------- */ + buildAnnencyActorList() { + let membersFull = {} + for(let id of this.system.base.characters) { + let actor = game.actors.get(id) + membersFull[id] = { name: actor.name, id: actor.id, img: actor.img } + } + return membersFull + } + /* ----------------------- --------------------- */ + addAnnencyActor(actorId) { + let members = duplicate(this.system.base.characters) + members.push(actorId) + this.update({ 'system.base.characters': members }) + } + async removeAnnencyActor(actorId) { + let members = this.system.base.characters.filter(id => id != actorId) + this.update({ 'system.base.characters': members }) + } + + /* -------------------------------------------- */ + getAnnency() { + return game.actors.find(a => a.type == 'annency' && a.system.base.characters.includes(this.id)) + } /* -------------------------------------------- */ getConfrontations() { return this.items.filter(it => it.type == "confrontation") diff --git a/modules/actors/ecryme-annency-sheet.js b/modules/actors/ecryme-annency-sheet.js new file mode 100644 index 0000000..f984d6a --- /dev/null +++ b/modules/actors/ecryme-annency-sheet.js @@ -0,0 +1,143 @@ +/** + * Extend the basic ActorSheet with some very simple modifications + * @extends {ActorSheet} + */ + +import { EcrymeUtility } from "../common/ecryme-utility.js"; + +/* -------------------------------------------- */ +export class EcrymeAnnencySheet extends ActorSheet { + + /** @override */ + static get defaultOptions() { + + return mergeObject(super.defaultOptions, { + classes: ["fvtt-ecryme", "sheet", "actor"], + template: "systems/fvtt-ecryme/templates/actors/annency-sheet.hbs", + width: 640, + height: 600, + tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "annency" }], + dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }], + editScore: true + }); + } + + /* -------------------------------------------- */ + async getData() { + + let formData = { + title: this.title, + id: this.actor.id, + type: this.actor.type, + img: this.actor.img, + name: this.actor.name, + editable: this.isEditable, + cssClass: this.isEditable ? "editable" : "locked", + system: duplicate(this.object.system), + limited: this.object.limited, + config: duplicate(game.system.ecryme.config), + hasCephaly: EcrymeUtility.hasCephaly(), + hasBoheme: EcrymeUtility.hasBoheme(), + hasAmertume: EcrymeUtility.hasAmertume(), + characters: this.actor.buildAnnencyActorList(), + options: this.options, + owner: this.document.isOwner, + editScore: this.options.editScore, + isGM: game.user.isGM + } + this.formData = formData; + + console.log("Annency : ", formData, this.object); + return formData; + } + + + /* -------------------------------------------- */ + /** @override */ + activateListeners(html) { + super.activateListeners(html); + + // Everything below here is only needed if the sheet is editable + if (!this.options.editable) return; + + html.bind("keydown", function (e) { // Ignore Enter in actores sheet + if (e.keyCode === 13) return false; + }); + + html.find('.actor-edit').click(ev => { + const li = $(ev.currentTarget).parents(".item") + let actorId = li.data("actor-id") + const actor = game.actors.get(actorId) + actor.sheet.render(true) + }) + html.find('.actor-delete').click(ev => { + const li = $(ev.currentTarget).parents(".item") + let actorId = li.data("actor-id") + this.actor.removeAnnencyActor(actorId) + }) + + + // Update Inventory Item + html.find('.item-edit').click(ev => { + const li = $(ev.currentTarget).parents(".item") + let itemId = li.data("item-id") + const item = this.actor.items.get(itemId); + item.sheet.render(true); + }); + // Delete Inventory Item + html.find('.item-delete').click(ev => { + const li = $(ev.currentTarget).parents(".item") + EcrymeUtility.confirmDelete(this, li).catch("Error : No deletion confirmed") + }) + html.find('.item-add').click(ev => { + let dataType = $(ev.currentTarget).data("type") + this.actor.createEmbeddedDocuments('Item', [{ name: "NewItem", type: dataType }], { renderSheet: true }) + }) + + html.find('.subactor-edit').click(ev => { + const li = $(ev.currentTarget).parents(".item"); + let actorId = li.data("actor-id"); + let actor = game.actors.get(actorId); + actor.sheet.render(true); + }); + + html.find('.subactor-delete').click(ev => { + const li = $(ev.currentTarget).parents(".item"); + let actorId = li.data("actor-id"); + this.actor.delSubActor(actorId); + }); + html.find('.update-field').change(ev => { + const fieldName = $(ev.currentTarget).data("field-name"); + let value = Number(ev.currentTarget.value); + this.actor.update({ [`${fieldName}`]: value }); + }); + } + + /* -------------------------------------------- */ + async _onDropActor(event, dragData) { + const actor = fromUuidSync(dragData.uuid) + if (actor) { + this.actor.addAnnencyActor(actor.id) + } else { + ui.notifications.warn("Actor not found") + } + super._onDropActor(event) + } + + /* -------------------------------------------- */ + /** @override */ + setPosition(options = {}) { + const position = super.setPosition(options); + const sheetBody = this.element.find(".sheet-body"); + const bodyHeight = position.height - 192; + sheetBody.css("height", bodyHeight); + return position; + } + + /* -------------------------------------------- */ + /** @override */ + _updateObject(event, formData) { + // Update the Actor + return this.object.update(formData); + } +} diff --git a/modules/ecryme-main.js b/modules/ecryme-main.js index 65e4fa7..abcaba7 100644 --- a/modules/ecryme-main.js +++ b/modules/ecryme-main.js @@ -11,6 +11,7 @@ import { EcrymeActor } from "./actors/ecryme-actor.js"; import { EcrymeItemSheet } from "./items/ecryme-item-sheet.js"; import { EcrymeActorSheet } from "./actors/ecryme-actor-sheet.js"; +import { EcrymeAnnencySheet } from "./actors/ecryme-annency-sheet.js"; import { EcrymeUtility } from "./common/ecryme-utility.js"; import { EcrymeCombat } from "./app/ecryme-combat.js"; import { EcrymeItem } from "./items/ecryme-item.js"; @@ -58,7 +59,7 @@ Hooks.once("init", async function () { // Register sheet application classes Actors.unregisterSheet("core", ActorSheet); Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["pc"], makeDefault: true }); - //Actors.registerSheet("fvtt-ecryme", EcrymeNPCSheet, { types: ["pnj"], makeDefault: false }); + Actors.registerSheet("fvtt-ecryme", EcrymeAnnencySheet, { types: ["annency"], makeDefault: false }); Items.unregisterSheet("core", ItemSheet); Items.registerSheet("fvtt-ecryme", EcrymeItemSheet, { makeDefault: true }); diff --git a/packs/equipment/000040.log b/packs/equipment/000048.log similarity index 100% rename from packs/equipment/000040.log rename to packs/equipment/000048.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index 59611b0..a6d5883 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index e4cb632..4d95011 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,7 +1,7 @@ -2023/08/08-09:07:13.603738 7f5867fff6c0 Recovering log #36 -2023/08/08-09:07:13.613379 7f5867fff6c0 Delete type=3 #34 -2023/08/08-09:07:13.613547 7f5867fff6c0 Delete type=0 #36 -2023/08/08-09:07:28.094335 7f58677fe6c0 Level-0 table #41: started -2023/08/08-09:07:28.094367 7f58677fe6c0 Level-0 table #41: 0 bytes OK -2023/08/08-09:07:28.130086 7f58677fe6c0 Delete type=0 #39 -2023/08/08-09:07:28.130372 7f58677fe6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +2023/08/08-14:38:49.036882 7f5afcdf86c0 Recovering log #44 +2023/08/08-14:38:49.124780 7f5afcdf86c0 Delete type=3 #42 +2023/08/08-14:38:49.124893 7f5afcdf86c0 Delete type=0 #44 +2023/08/08-14:54:21.588098 7f58677fe6c0 Level-0 table #49: started +2023/08/08-14:54:21.588122 7f58677fe6c0 Level-0 table #49: 0 bytes OK +2023/08/08-14:54:21.594444 7f58677fe6c0 Delete type=0 #47 +2023/08/08-14:54:21.607310 7f58677fe6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/LOG.old b/packs/equipment/LOG.old index a836111..e9370e5 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,7 +1,7 @@ -2023/08/08-08:56:25.009827 7f5afcdf86c0 Recovering log #32 -2023/08/08-08:56:25.043068 7f5afcdf86c0 Delete type=3 #30 -2023/08/08-08:56:25.043112 7f5afcdf86c0 Delete type=0 #32 -2023/08/08-09:07:10.720233 7f58677fe6c0 Level-0 table #37: started -2023/08/08-09:07:10.720259 7f58677fe6c0 Level-0 table #37: 0 bytes OK -2023/08/08-09:07:10.728506 7f58677fe6c0 Delete type=0 #35 -2023/08/08-09:07:10.742534 7f58677fe6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +2023/08/08-14:36:00.338439 7f5867fff6c0 Recovering log #40 +2023/08/08-14:36:00.347950 7f5867fff6c0 Delete type=3 #38 +2023/08/08-14:36:00.348021 7f5867fff6c0 Delete type=0 #40 +2023/08/08-14:38:45.882749 7f58677fe6c0 Level-0 table #45: started +2023/08/08-14:38:45.882812 7f58677fe6c0 Level-0 table #45: 0 bytes OK +2023/08/08-14:38:45.920058 7f58677fe6c0 Delete type=0 #43 +2023/08/08-14:38:45.981054 7f58677fe6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000038 b/packs/equipment/MANIFEST-000046 similarity index 73% rename from packs/equipment/MANIFEST-000038 rename to packs/equipment/MANIFEST-000046 index 3835e47..52d87e3 100644 Binary files a/packs/equipment/MANIFEST-000038 and b/packs/equipment/MANIFEST-000046 differ diff --git a/packs/maneuvers/000040.log b/packs/maneuvers/000048.log similarity index 100% rename from packs/maneuvers/000040.log rename to packs/maneuvers/000048.log diff --git a/packs/maneuvers/CURRENT b/packs/maneuvers/CURRENT index 59611b0..a6d5883 100644 --- a/packs/maneuvers/CURRENT +++ b/packs/maneuvers/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/maneuvers/LOG b/packs/maneuvers/LOG index 6f553e5..e840f93 100644 --- a/packs/maneuvers/LOG +++ b/packs/maneuvers/LOG @@ -1,7 +1,7 @@ -2023/08/08-09:07:13.616518 7f5867fff6c0 Recovering log #36 -2023/08/08-09:07:13.626451 7f5867fff6c0 Delete type=3 #34 -2023/08/08-09:07:13.626504 7f5867fff6c0 Delete type=0 #36 -2023/08/08-09:07:28.173846 7f58677fe6c0 Level-0 table #41: started -2023/08/08-09:07:28.173906 7f58677fe6c0 Level-0 table #41: 0 bytes OK -2023/08/08-09:07:28.221287 7f58677fe6c0 Delete type=0 #39 -2023/08/08-09:07:28.221402 7f58677fe6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) +2023/08/08-14:38:49.155473 7f5867fff6c0 Recovering log #44 +2023/08/08-14:38:49.260893 7f5867fff6c0 Delete type=3 #42 +2023/08/08-14:38:49.260950 7f5867fff6c0 Delete type=0 #44 +2023/08/08-14:54:21.600756 7f58677fe6c0 Level-0 table #49: started +2023/08/08-14:54:21.600776 7f58677fe6c0 Level-0 table #49: 0 bytes OK +2023/08/08-14:54:21.607211 7f58677fe6c0 Delete type=0 #47 +2023/08/08-14:54:21.607330 7f58677fe6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/LOG.old b/packs/maneuvers/LOG.old index 930cc29..73f50ce 100644 --- a/packs/maneuvers/LOG.old +++ b/packs/maneuvers/LOG.old @@ -1,7 +1,7 @@ -2023/08/08-08:56:25.046084 7f5867fff6c0 Recovering log #32 -2023/08/08-08:56:25.085371 7f5867fff6c0 Delete type=3 #30 -2023/08/08-08:56:25.085419 7f5867fff6c0 Delete type=0 #32 -2023/08/08-09:07:10.736291 7f58677fe6c0 Level-0 table #37: started -2023/08/08-09:07:10.736337 7f58677fe6c0 Level-0 table #37: 0 bytes OK -2023/08/08-09:07:10.742372 7f58677fe6c0 Delete type=0 #35 -2023/08/08-09:07:10.742595 7f58677fe6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) +2023/08/08-14:36:00.351163 7f5867fff6c0 Recovering log #40 +2023/08/08-14:36:00.363535 7f5867fff6c0 Delete type=3 #38 +2023/08/08-14:36:00.363690 7f5867fff6c0 Delete type=0 #40 +2023/08/08-14:38:46.072007 7f58677fe6c0 Level-0 table #45: started +2023/08/08-14:38:46.072050 7f58677fe6c0 Level-0 table #45: 0 bytes OK +2023/08/08-14:38:46.103317 7f58677fe6c0 Delete type=0 #43 +2023/08/08-14:38:46.137931 7f58677fe6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/MANIFEST-000038 b/packs/maneuvers/MANIFEST-000046 similarity index 76% rename from packs/maneuvers/MANIFEST-000038 rename to packs/maneuvers/MANIFEST-000046 index de501dd..6893ee9 100644 Binary files a/packs/maneuvers/MANIFEST-000038 and b/packs/maneuvers/MANIFEST-000046 differ diff --git a/packs/specialisation/000040.log b/packs/specialisation/000048.log similarity index 100% rename from packs/specialisation/000040.log rename to packs/specialisation/000048.log diff --git a/packs/specialisation/CURRENT b/packs/specialisation/CURRENT index 59611b0..a6d5883 100644 --- a/packs/specialisation/CURRENT +++ b/packs/specialisation/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/specialisation/LOG b/packs/specialisation/LOG index 097e47b..f9a205e 100644 --- a/packs/specialisation/LOG +++ b/packs/specialisation/LOG @@ -1,7 +1,7 @@ -2023/08/08-09:07:13.603739 7f5afddfa6c0 Recovering log #36 -2023/08/08-09:07:13.613381 7f5afddfa6c0 Delete type=3 #34 -2023/08/08-09:07:13.613431 7f5afddfa6c0 Delete type=0 #36 -2023/08/08-09:07:28.018452 7f58677fe6c0 Level-0 table #41: started -2023/08/08-09:07:28.018491 7f58677fe6c0 Level-0 table #41: 0 bytes OK -2023/08/08-09:07:28.055806 7f58677fe6c0 Delete type=0 #39 -2023/08/08-09:07:28.130329 7f58677fe6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) +2023/08/08-14:38:49.036954 7f5867fff6c0 Recovering log #44 +2023/08/08-14:38:49.153034 7f5867fff6c0 Delete type=3 #42 +2023/08/08-14:38:49.153108 7f5867fff6c0 Delete type=0 #44 +2023/08/08-14:54:21.558302 7f58677fe6c0 Level-0 table #49: started +2023/08/08-14:54:21.558341 7f58677fe6c0 Level-0 table #49: 0 bytes OK +2023/08/08-14:54:21.572779 7f58677fe6c0 Delete type=0 #47 +2023/08/08-14:54:21.573011 7f58677fe6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) diff --git a/packs/specialisation/LOG.old b/packs/specialisation/LOG.old index 7547ee5..702f257 100644 --- a/packs/specialisation/LOG.old +++ b/packs/specialisation/LOG.old @@ -1,7 +1,7 @@ -2023/08/08-08:56:25.009829 7f5867fff6c0 Recovering log #32 -2023/08/08-08:56:25.043069 7f5867fff6c0 Delete type=3 #30 -2023/08/08-08:56:25.043120 7f5867fff6c0 Delete type=0 #32 -2023/08/08-09:07:10.688033 7f58677fe6c0 Level-0 table #37: started -2023/08/08-09:07:10.688071 7f58677fe6c0 Level-0 table #37: 0 bytes OK -2023/08/08-09:07:10.694013 7f58677fe6c0 Delete type=0 #35 -2023/08/08-09:07:10.710270 7f58677fe6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) +2023/08/08-14:36:00.338438 7f5afd5f96c0 Recovering log #40 +2023/08/08-14:36:00.347864 7f5afd5f96c0 Delete type=3 #38 +2023/08/08-14:36:00.347905 7f5afd5f96c0 Delete type=0 #40 +2023/08/08-14:38:46.031269 7f58677fe6c0 Level-0 table #45: started +2023/08/08-14:38:46.031315 7f58677fe6c0 Level-0 table #45: 0 bytes OK +2023/08/08-14:38:46.071808 7f58677fe6c0 Delete type=0 #43 +2023/08/08-14:38:46.137889 7f58677fe6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) diff --git a/packs/specialisation/MANIFEST-000038 b/packs/specialisation/MANIFEST-000046 similarity index 75% rename from packs/specialisation/MANIFEST-000038 rename to packs/specialisation/MANIFEST-000046 index 9fe52b7..7120b94 100644 Binary files a/packs/specialisation/MANIFEST-000038 and b/packs/specialisation/MANIFEST-000046 differ diff --git a/packs/traits/000040.log b/packs/traits/000048.log similarity index 100% rename from packs/traits/000040.log rename to packs/traits/000048.log diff --git a/packs/traits/CURRENT b/packs/traits/CURRENT index 59611b0..a6d5883 100644 --- a/packs/traits/CURRENT +++ b/packs/traits/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/traits/LOG b/packs/traits/LOG index 0eb6712..a2051b0 100644 --- a/packs/traits/LOG +++ b/packs/traits/LOG @@ -1,7 +1,7 @@ -2023/08/08-09:07:13.616518 7f5afd5f96c0 Recovering log #36 -2023/08/08-09:07:13.626497 7f5afd5f96c0 Delete type=3 #34 -2023/08/08-09:07:13.626556 7f5afd5f96c0 Delete type=0 #36 -2023/08/08-09:07:28.130506 7f58677fe6c0 Level-0 table #41: started -2023/08/08-09:07:28.130559 7f58677fe6c0 Level-0 table #41: 0 bytes OK -2023/08/08-09:07:28.173605 7f58677fe6c0 Delete type=0 #39 -2023/08/08-09:07:28.221390 7f58677fe6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) +2023/08/08-14:38:49.127661 7f5afcdf86c0 Recovering log #44 +2023/08/08-14:38:49.237408 7f5afcdf86c0 Delete type=3 #42 +2023/08/08-14:38:49.237452 7f5afcdf86c0 Delete type=0 #44 +2023/08/08-14:54:21.594546 7f58677fe6c0 Level-0 table #49: started +2023/08/08-14:54:21.594573 7f58677fe6c0 Level-0 table #49: 0 bytes OK +2023/08/08-14:54:21.600659 7f58677fe6c0 Delete type=0 #47 +2023/08/08-14:54:21.607322 7f58677fe6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) diff --git a/packs/traits/LOG.old b/packs/traits/LOG.old index 8d2d6e3..2d8b795 100644 --- a/packs/traits/LOG.old +++ b/packs/traits/LOG.old @@ -1,7 +1,7 @@ -2023/08/08-08:56:25.046084 7f5afcdf86c0 Recovering log #32 -2023/08/08-08:56:25.085370 7f5afcdf86c0 Delete type=3 #30 -2023/08/08-08:56:25.085408 7f5afcdf86c0 Delete type=0 #32 -2023/08/08-09:07:10.728779 7f58677fe6c0 Level-0 table #37: started -2023/08/08-09:07:10.728820 7f58677fe6c0 Level-0 table #37: 0 bytes OK -2023/08/08-09:07:10.736158 7f58677fe6c0 Delete type=0 #35 -2023/08/08-09:07:10.742554 7f58677fe6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) +2023/08/08-14:36:00.351163 7f5afd5f96c0 Recovering log #40 +2023/08/08-14:36:00.360537 7f5afd5f96c0 Delete type=3 #38 +2023/08/08-14:36:00.360576 7f5afd5f96c0 Delete type=0 #40 +2023/08/08-14:38:46.103419 7f58677fe6c0 Level-0 table #45: started +2023/08/08-14:38:46.103439 7f58677fe6c0 Level-0 table #45: 0 bytes OK +2023/08/08-14:38:46.137624 7f58677fe6c0 Delete type=0 #43 +2023/08/08-14:38:46.137971 7f58677fe6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) diff --git a/packs/traits/MANIFEST-000038 b/packs/traits/MANIFEST-000046 similarity index 75% rename from packs/traits/MANIFEST-000038 rename to packs/traits/MANIFEST-000046 index ebec96a..d9f3b55 100644 Binary files a/packs/traits/MANIFEST-000038 and b/packs/traits/MANIFEST-000046 differ diff --git a/system.json b/system.json index 71e8593..9c6c54d 100644 --- a/system.json +++ b/system.json @@ -90,7 +90,7 @@ ], "title": "Ecryme, le Jeu de Rôles", "url": "https://www.uberwald.me/gitea/uberwald/fvtt-ecryme", - "version": "11.0.13", - "download": "https://www.uberwald.me/gitea/uberwald/fvtt-ecryme/archive/fvtt-ecryme-v11.0.13.zip", + "version": "11.0.16", + "download": "https://www.uberwald.me/gitea/uberwald/fvtt-ecryme/archive/fvtt-ecryme-v11.0.16.zip", "background": "systems/fvtt-ecryme/images/assets/ecryme_extract_panel_01.webp" } \ No newline at end of file diff --git a/template.json b/template.json index b265bde..220cac8 100644 --- a/template.json +++ b/template.json @@ -1,7 +1,7 @@ { "Actor": { "types": [ - "pc" + "pc","annency" ], "templates": { "biodata": { @@ -136,20 +136,6 @@ "major": 0 } }, - "annency": { - "iscollective": false, - "ismultiple": false, - "characters": "", - "location": {"1": "", "2": "", "3":"", "4":"", "5":"" }, - "description": "", - "enhancements": "", - "boheme": { - "name": "", - "ideals": "", - "politic": "", - "description": "" - } - }, "cephaly": { "name": "ECRY.ui.cephaly", "skilllist": { @@ -187,8 +173,29 @@ "npccore": { "npctype": "", "description": "" + }, + "annency": { + "base": { + "iscollective": false, + "ismultiple": false, + "characters": [], + "location": {"1": "", "2": "", "3":"", "4":"", "5":"" }, + "description": "", + "enhancements": "" + }, + "boheme": { + "name": "", + "ideals": "", + "politic": "", + "description": "" + } } }, + "annency": { + "templates": [ + "annency" + ] + }, "pc": { "templates": [ "biodata", diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index f4847d7..ae9911b 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -151,74 +151,20 @@ {{/each}} -

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

- - -

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

- -
-

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

-
diff --git a/templates/actors/annency-sheet.hbs b/templates/actors/annency-sheet.hbs new file mode 100644 index 0000000..1b60cb6 --- /dev/null +++ b/templates/actors/annency-sheet.hbs @@ -0,0 +1,138 @@ +
+ + {{!-- Sheet Header --}} +
+
+
+ +
+ +
+ +
+

+ +
+
    +
  • + + +
    • +
+
+ +
+
+
+ + +
+ + {{!-- 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