diff --git a/modules/actors/ecryme-actor-sheet.js b/modules/actors/ecryme-actor-sheet.js index 9b718cf..d46998f 100644 --- a/modules/actors/ecryme-actor-sheet.js +++ b/modules/actors/ecryme-actor-sheet.js @@ -90,6 +90,9 @@ export class EcrymeActorSheet extends ActorSheet { html.find('.item-edit').click(ev => { const li = $(ev.currentTarget).parents(".item") let itemId = li.data("item-id") + if (!itemId) { + itemId = $(ev.currentTarget).data("item-id") + } const item = this.actor.items.get( itemId ); item.sheet.render(true); }); diff --git a/modules/actors/ecryme-actor.js b/modules/actors/ecryme-actor.js index 440cb30..483a0ee 100644 --- a/modules/actors/ecryme-actor.js +++ b/modules/actors/ecryme-actor.js @@ -387,14 +387,25 @@ export class EcrymeActor extends Actor { /* -------------------------------------------- */ getCommonSkill(categKey, skillKey) { - let skill = this.system.skills[categKey].skilllist[skillKey] let rollData = this.getCommonRollData() - - skill = duplicate(skill) + + // Specific NPC case + let skill + if (skillKey == "rawnpc") { + skill = { + name: "ECRY.ui." + categKey, + max: 10, + value: this.system.skills[categKey].pnjvalue, + spec: [] + } + } else { + skill = this.system.skills[categKey].skilllist[skillKey] + skill = duplicate(skill) + skill.spec = this.getSpecializations(skillKey) + } + skill.categKey = categKey skill.skillKey = skillKey - skill.spec = this.getSpecializations(skillKey) - rollData.skill = skill rollData.img = skill.img rollData.impactMalus = this.getImpactMalus(categKey) diff --git a/packs/equipment/000136.log b/packs/equipment/000148.log similarity index 100% rename from packs/equipment/000136.log rename to packs/equipment/000148.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index f816b37..ffd4a01 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000134 +MANIFEST-000146 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index ad9704b..eb1f74e 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,7 +1,7 @@ -2024/03/18-21:27:36.619259 7fb017e006c0 Recovering log #132 -2024/03/18-21:27:36.630215 7fb017e006c0 Delete type=3 #130 -2024/03/18-21:27:36.630317 7fb017e006c0 Delete type=0 #132 -2024/03/18-21:44:13.762166 7fb015a006c0 Level-0 table #137: started -2024/03/18-21:44:13.762215 7fb015a006c0 Level-0 table #137: 0 bytes OK -2024/03/18-21:44:13.768765 7fb015a006c0 Delete type=0 #135 -2024/03/18-21:44:13.775818 7fb015a006c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +2024/03/19-08:59:49.412009 7fe1974006c0 Recovering log #144 +2024/03/19-08:59:49.422002 7fe1974006c0 Delete type=3 #142 +2024/03/19-08:59:49.422641 7fe1974006c0 Delete type=0 #144 +2024/03/19-09:13:11.433053 7fe18fe006c0 Level-0 table #149: started +2024/03/19-09:13:11.433076 7fe18fe006c0 Level-0 table #149: 0 bytes OK +2024/03/19-09:13:11.439309 7fe18fe006c0 Delete type=0 #147 +2024/03/19-09:13:11.449116 7fe18fe006c0 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 fc2e7d1..245d59d 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,7 +1,7 @@ -2024/03/15-16:29:29.461394 7f7df20006c0 Recovering log #128 -2024/03/15-16:29:29.471348 7f7df20006c0 Delete type=3 #126 -2024/03/15-16:29:29.471493 7f7df20006c0 Delete type=0 #128 -2024/03/15-16:35:28.397309 7f7debe006c0 Level-0 table #133: started -2024/03/15-16:35:28.397348 7f7debe006c0 Level-0 table #133: 0 bytes OK -2024/03/15-16:35:28.403860 7f7debe006c0 Delete type=0 #131 -2024/03/15-16:35:28.411176 7f7debe006c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +2024/03/19-08:26:23.599709 7fe196a006c0 Recovering log #140 +2024/03/19-08:26:23.609740 7fe196a006c0 Delete type=3 #138 +2024/03/19-08:26:23.610001 7fe196a006c0 Delete type=0 #140 +2024/03/19-08:59:38.616836 7fe18fe006c0 Level-0 table #145: started +2024/03/19-08:59:38.616860 7fe18fe006c0 Level-0 table #145: 0 bytes OK +2024/03/19-08:59:38.622855 7fe18fe006c0 Delete type=0 #143 +2024/03/19-08:59:38.629513 7fe18fe006c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000134 b/packs/equipment/MANIFEST-000146 similarity index 72% rename from packs/equipment/MANIFEST-000134 rename to packs/equipment/MANIFEST-000146 index 294ec97..0bc6646 100644 Binary files a/packs/equipment/MANIFEST-000134 and b/packs/equipment/MANIFEST-000146 differ diff --git a/packs/help/000072.log b/packs/help/000085.log similarity index 100% rename from packs/help/000072.log rename to packs/help/000085.log diff --git a/packs/help/CURRENT b/packs/help/CURRENT index bcf1079..011e5ad 100644 --- a/packs/help/CURRENT +++ b/packs/help/CURRENT @@ -1 +1 @@ -MANIFEST-000070 +MANIFEST-000083 diff --git a/packs/help/LOG b/packs/help/LOG index 80c6303..b428008 100644 --- a/packs/help/LOG +++ b/packs/help/LOG @@ -1,15 +1,8 @@ -2024/03/18-21:27:36.675619 7fb0174006c0 Recovering log #68 -2024/03/18-21:27:36.685388 7fb0174006c0 Delete type=3 #66 -2024/03/18-21:27:36.685495 7fb0174006c0 Delete type=0 #68 -2024/03/18-21:44:13.790087 7fb015a006c0 Level-0 table #73: started -2024/03/18-21:44:13.801144 7fb015a006c0 Level-0 table #73: 2207 bytes OK -2024/03/18-21:44:13.808000 7fb015a006c0 Delete type=0 #71 -2024/03/18-21:44:13.808225 7fb015a006c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) -2024/03/18-21:44:13.808250 7fb015a006c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 10 : 1 -2024/03/18-21:44:13.808256 7fb015a006c0 Compacting 1@1 + 1@2 files -2024/03/18-21:44:13.811516 7fb015a006c0 Generated table #74@1: 4 keys, 2136 bytes -2024/03/18-21:44:13.811547 7fb015a006c0 Compacted 1@1 + 1@2 files => 2136 bytes -2024/03/18-21:44:13.817935 7fb015a006c0 compacted to: files[ 0 0 1 0 0 0 0 ] -2024/03/18-21:44:13.818041 7fb015a006c0 Delete type=2 #5 -2024/03/18-21:44:13.818166 7fb015a006c0 Delete type=2 #73 -2024/03/18-21:44:13.818271 7fb015a006c0 Manual compaction at level-1 from '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 10 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2024/03/19-08:59:49.466407 7fe1956006c0 Recovering log #81 +2024/03/19-08:59:49.476751 7fe1956006c0 Delete type=3 #79 +2024/03/19-08:59:49.476810 7fe1956006c0 Delete type=0 #81 +2024/03/19-09:13:11.469451 7fe18fe006c0 Level-0 table #86: started +2024/03/19-09:13:11.469477 7fe18fe006c0 Level-0 table #86: 0 bytes OK +2024/03/19-09:13:11.476330 7fe18fe006c0 Delete type=0 #84 +2024/03/19-09:13:11.476450 7fe18fe006c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2024/03/19-09:13:11.476467 7fe18fe006c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) diff --git a/packs/help/LOG.old b/packs/help/LOG.old index e627fc1..6115082 100644 --- a/packs/help/LOG.old +++ b/packs/help/LOG.old @@ -1,8 +1,8 @@ -2024/03/15-16:29:29.511445 7f7df34006c0 Recovering log #64 -2024/03/15-16:29:29.522076 7f7df34006c0 Delete type=3 #62 -2024/03/15-16:29:29.522169 7f7df34006c0 Delete type=0 #64 -2024/03/15-16:35:28.411192 7f7debe006c0 Level-0 table #69: started -2024/03/15-16:35:28.411232 7f7debe006c0 Level-0 table #69: 0 bytes OK -2024/03/15-16:35:28.417476 7f7debe006c0 Delete type=0 #67 -2024/03/15-16:35:28.424950 7f7debe006c0 Manual compaction at level-0 from '!journal!N3XOO6dRLuKwQfp2' @ 72057594037927935 : 1 .. '!journal.pages!N3XOO6dRLuKwQfp2.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) -2024/03/15-16:35:28.424986 7f7debe006c0 Manual compaction at level-1 from '!journal!N3XOO6dRLuKwQfp2' @ 72057594037927935 : 1 .. '!journal.pages!N3XOO6dRLuKwQfp2.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2024/03/19-08:26:23.652790 7fe1974006c0 Recovering log #77 +2024/03/19-08:26:23.662568 7fe1974006c0 Delete type=3 #75 +2024/03/19-08:26:23.662632 7fe1974006c0 Delete type=0 #77 +2024/03/19-08:59:38.642890 7fe18fe006c0 Level-0 table #82: started +2024/03/19-08:59:38.642925 7fe18fe006c0 Level-0 table #82: 0 bytes OK +2024/03/19-08:59:38.649550 7fe18fe006c0 Delete type=0 #80 +2024/03/19-08:59:38.649669 7fe18fe006c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2024/03/19-08:59:38.649688 7fe18fe006c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) diff --git a/packs/help/MANIFEST-000070 b/packs/help/MANIFEST-000070 deleted file mode 100644 index a00b884..0000000 Binary files a/packs/help/MANIFEST-000070 and /dev/null differ diff --git a/packs/help/MANIFEST-000083 b/packs/help/MANIFEST-000083 new file mode 100644 index 0000000..bb06d86 Binary files /dev/null and b/packs/help/MANIFEST-000083 differ diff --git a/packs/maneuvers/000136.log b/packs/maneuvers/000148.log similarity index 100% rename from packs/maneuvers/000136.log rename to packs/maneuvers/000148.log diff --git a/packs/maneuvers/CURRENT b/packs/maneuvers/CURRENT index f816b37..ffd4a01 100644 --- a/packs/maneuvers/CURRENT +++ b/packs/maneuvers/CURRENT @@ -1 +1 @@ -MANIFEST-000134 +MANIFEST-000146 diff --git a/packs/maneuvers/LOG b/packs/maneuvers/LOG index fef35e3..a7a4849 100644 --- a/packs/maneuvers/LOG +++ b/packs/maneuvers/LOG @@ -1,7 +1,7 @@ -2024/03/18-21:27:36.662299 7fb017e006c0 Recovering log #132 -2024/03/18-21:27:36.672660 7fb017e006c0 Delete type=3 #130 -2024/03/18-21:27:36.672727 7fb017e006c0 Delete type=0 #132 -2024/03/18-21:44:13.783262 7fb015a006c0 Level-0 table #137: started -2024/03/18-21:44:13.783332 7fb015a006c0 Level-0 table #137: 0 bytes OK -2024/03/18-21:44:13.789886 7fb015a006c0 Delete type=0 #135 -2024/03/18-21:44:13.808213 7fb015a006c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) +2024/03/19-08:59:49.453929 7fe1974006c0 Recovering log #144 +2024/03/19-08:59:49.464351 7fe1974006c0 Delete type=3 #142 +2024/03/19-08:59:49.464411 7fe1974006c0 Delete type=0 #144 +2024/03/19-09:13:11.463206 7fe18fe006c0 Level-0 table #149: started +2024/03/19-09:13:11.463229 7fe18fe006c0 Level-0 table #149: 0 bytes OK +2024/03/19-09:13:11.469351 7fe18fe006c0 Delete type=0 #147 +2024/03/19-09:13:11.476419 7fe18fe006c0 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 b0df071..e52229b 100644 --- a/packs/maneuvers/LOG.old +++ b/packs/maneuvers/LOG.old @@ -1,7 +1,7 @@ -2024/03/15-16:29:29.499552 7f7df20006c0 Recovering log #128 -2024/03/15-16:29:29.509238 7f7df20006c0 Delete type=3 #126 -2024/03/15-16:29:29.509293 7f7df20006c0 Delete type=0 #128 -2024/03/15-16:35:28.417564 7f7debe006c0 Level-0 table #133: started -2024/03/15-16:35:28.417584 7f7debe006c0 Level-0 table #133: 0 bytes OK -2024/03/15-16:35:28.424846 7f7debe006c0 Delete type=0 #131 -2024/03/15-16:35:28.424970 7f7debe006c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) +2024/03/19-08:26:23.639789 7fe196a006c0 Recovering log #140 +2024/03/19-08:26:23.649226 7fe196a006c0 Delete type=3 #138 +2024/03/19-08:26:23.649311 7fe196a006c0 Delete type=0 #140 +2024/03/19-08:59:38.636120 7fe18fe006c0 Level-0 table #145: started +2024/03/19-08:59:38.636145 7fe18fe006c0 Level-0 table #145: 0 bytes OK +2024/03/19-08:59:38.642769 7fe18fe006c0 Delete type=0 #143 +2024/03/19-08:59:38.649658 7fe18fe006c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/MANIFEST-000134 b/packs/maneuvers/MANIFEST-000146 similarity index 74% rename from packs/maneuvers/MANIFEST-000134 rename to packs/maneuvers/MANIFEST-000146 index eb3626e..8e2cc86 100644 Binary files a/packs/maneuvers/MANIFEST-000134 and b/packs/maneuvers/MANIFEST-000146 differ diff --git a/packs/scenes/000020.log b/packs/scenes/000032.log similarity index 100% rename from packs/scenes/000020.log rename to packs/scenes/000032.log diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT index e417a51..caa721a 100644 --- a/packs/scenes/CURRENT +++ b/packs/scenes/CURRENT @@ -1 +1 @@ -MANIFEST-000018 +MANIFEST-000030 diff --git a/packs/scenes/LOG b/packs/scenes/LOG index bbcef09..19fe6b6 100644 --- a/packs/scenes/LOG +++ b/packs/scenes/LOG @@ -1,8 +1,8 @@ -2024/03/18-21:27:36.648797 7fb017e006c0 Recovering log #16 -2024/03/18-21:27:36.658451 7fb017e006c0 Delete type=3 #14 -2024/03/18-21:27:36.658875 7fb017e006c0 Delete type=0 #16 -2024/03/18-21:44:13.775844 7fb015a006c0 Level-0 table #21: started -2024/03/18-21:44:13.775912 7fb015a006c0 Level-0 table #21: 0 bytes OK -2024/03/18-21:44:13.782966 7fb015a006c0 Delete type=0 #19 -2024/03/18-21:44:13.808193 7fb015a006c0 Manual compaction at level-0 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) -2024/03/18-21:44:13.808235 7fb015a006c0 Manual compaction at level-1 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) +2024/03/19-08:59:49.439960 7fe1974006c0 Recovering log #28 +2024/03/19-08:59:49.450519 7fe1974006c0 Delete type=3 #26 +2024/03/19-08:59:49.450564 7fe1974006c0 Delete type=0 #28 +2024/03/19-09:13:11.449133 7fe18fe006c0 Level-0 table #33: started +2024/03/19-09:13:11.449161 7fe18fe006c0 Level-0 table #33: 0 bytes OK +2024/03/19-09:13:11.455581 7fe18fe006c0 Delete type=0 #31 +2024/03/19-09:13:11.469432 7fe18fe006c0 Manual compaction at level-0 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) +2024/03/19-09:13:11.476429 7fe18fe006c0 Manual compaction at level-1 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/LOG.old b/packs/scenes/LOG.old index 7e66c0d..cc6a09e 100644 --- a/packs/scenes/LOG.old +++ b/packs/scenes/LOG.old @@ -1,8 +1,8 @@ -2024/03/15-16:29:29.486982 7f7df20006c0 Recovering log #12 -2024/03/15-16:29:29.496623 7f7df20006c0 Delete type=3 #10 -2024/03/15-16:29:29.496680 7f7df20006c0 Delete type=0 #12 -2024/03/15-16:35:28.404055 7f7debe006c0 Level-0 table #17: started -2024/03/15-16:35:28.404098 7f7debe006c0 Level-0 table #17: 0 bytes OK -2024/03/15-16:35:28.410985 7f7debe006c0 Delete type=0 #15 -2024/03/15-16:35:28.417555 7f7debe006c0 Manual compaction at level-0 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) -2024/03/15-16:35:28.424962 7f7debe006c0 Manual compaction at level-1 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) +2024/03/19-08:26:23.626739 7fe196a006c0 Recovering log #24 +2024/03/19-08:26:23.637137 7fe196a006c0 Delete type=3 #22 +2024/03/19-08:26:23.637185 7fe196a006c0 Delete type=0 #24 +2024/03/19-08:59:38.629525 7fe18fe006c0 Level-0 table #29: started +2024/03/19-08:59:38.629567 7fe18fe006c0 Level-0 table #29: 0 bytes OK +2024/03/19-08:59:38.635979 7fe18fe006c0 Delete type=0 #27 +2024/03/19-08:59:38.649644 7fe18fe006c0 Manual compaction at level-0 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) +2024/03/19-08:59:38.649696 7fe18fe006c0 Manual compaction at level-1 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/MANIFEST-000018 b/packs/scenes/MANIFEST-000030 similarity index 76% rename from packs/scenes/MANIFEST-000018 rename to packs/scenes/MANIFEST-000030 index 0130eae..700aaaf 100644 Binary files a/packs/scenes/MANIFEST-000018 and b/packs/scenes/MANIFEST-000030 differ diff --git a/packs/specialisation/000136.log b/packs/specialisation/000148.log similarity index 100% rename from packs/specialisation/000136.log rename to packs/specialisation/000148.log diff --git a/packs/specialisation/CURRENT b/packs/specialisation/CURRENT index f816b37..ffd4a01 100644 --- a/packs/specialisation/CURRENT +++ b/packs/specialisation/CURRENT @@ -1 +1 @@ -MANIFEST-000134 +MANIFEST-000146 diff --git a/packs/specialisation/LOG b/packs/specialisation/LOG index 9325ffb..eae1306 100644 --- a/packs/specialisation/LOG +++ b/packs/specialisation/LOG @@ -1,7 +1,7 @@ -2024/03/18-21:27:36.605584 7fb0174006c0 Recovering log #132 -2024/03/18-21:27:36.615261 7fb0174006c0 Delete type=3 #130 -2024/03/18-21:27:36.615507 7fb0174006c0 Delete type=0 #132 -2024/03/18-21:44:13.755365 7fb015a006c0 Level-0 table #137: started -2024/03/18-21:44:13.755406 7fb015a006c0 Level-0 table #137: 0 bytes OK -2024/03/18-21:44:13.761940 7fb015a006c0 Delete type=0 #135 -2024/03/18-21:44:13.775775 7fb015a006c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) +2024/03/19-08:59:49.399329 7fe1956006c0 Recovering log #144 +2024/03/19-08:59:49.409751 7fe1956006c0 Delete type=3 #142 +2024/03/19-08:59:49.409855 7fe1956006c0 Delete type=0 #144 +2024/03/19-09:13:11.426894 7fe18fe006c0 Level-0 table #149: started +2024/03/19-09:13:11.426924 7fe18fe006c0 Level-0 table #149: 0 bytes OK +2024/03/19-09:13:11.432936 7fe18fe006c0 Delete type=0 #147 +2024/03/19-09:13:11.439402 7fe18fe006c0 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 f1f3923..2c06703 100644 --- a/packs/specialisation/LOG.old +++ b/packs/specialisation/LOG.old @@ -1,7 +1,7 @@ -2024/03/15-16:29:29.447153 7f7df34006c0 Recovering log #128 -2024/03/15-16:29:29.458144 7f7df34006c0 Delete type=3 #126 -2024/03/15-16:29:29.458197 7f7df34006c0 Delete type=0 #128 -2024/03/15-16:35:28.383414 7f7debe006c0 Level-0 table #133: started -2024/03/15-16:35:28.383464 7f7debe006c0 Level-0 table #133: 0 bytes OK -2024/03/15-16:35:28.390768 7f7debe006c0 Delete type=0 #131 -2024/03/15-16:35:28.404037 7f7debe006c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) +2024/03/19-08:26:23.586366 7fe1974006c0 Recovering log #140 +2024/03/19-08:26:23.596561 7fe1974006c0 Delete type=3 #138 +2024/03/19-08:26:23.596616 7fe1974006c0 Delete type=0 #140 +2024/03/19-08:59:38.610581 7fe18fe006c0 Level-0 table #145: started +2024/03/19-08:59:38.610610 7fe18fe006c0 Level-0 table #145: 0 bytes OK +2024/03/19-08:59:38.616719 7fe18fe006c0 Delete type=0 #143 +2024/03/19-08:59:38.629493 7fe18fe006c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) diff --git a/packs/specialisation/MANIFEST-000134 b/packs/specialisation/MANIFEST-000146 similarity index 73% rename from packs/specialisation/MANIFEST-000134 rename to packs/specialisation/MANIFEST-000146 index 3c2a4b4..44339a6 100644 Binary files a/packs/specialisation/MANIFEST-000134 and b/packs/specialisation/MANIFEST-000146 differ diff --git a/packs/traits/000136.log b/packs/traits/000148.log similarity index 100% rename from packs/traits/000136.log rename to packs/traits/000148.log diff --git a/packs/traits/CURRENT b/packs/traits/CURRENT index f816b37..ffd4a01 100644 --- a/packs/traits/CURRENT +++ b/packs/traits/CURRENT @@ -1 +1 @@ -MANIFEST-000134 +MANIFEST-000146 diff --git a/packs/traits/LOG b/packs/traits/LOG index 9b8f156..a704659 100644 --- a/packs/traits/LOG +++ b/packs/traits/LOG @@ -1,7 +1,7 @@ -2024/03/18-21:27:36.634738 7fb0174006c0 Recovering log #132 -2024/03/18-21:27:36.644980 7fb0174006c0 Delete type=3 #130 -2024/03/18-21:27:36.645138 7fb0174006c0 Delete type=0 #132 -2024/03/18-21:44:13.768924 7fb015a006c0 Level-0 table #137: started -2024/03/18-21:44:13.768963 7fb015a006c0 Level-0 table #137: 0 bytes OK -2024/03/18-21:44:13.775416 7fb015a006c0 Delete type=0 #135 -2024/03/18-21:44:13.783223 7fb015a006c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) +2024/03/19-08:59:49.425377 7fe1956006c0 Recovering log #144 +2024/03/19-08:59:49.436099 7fe1956006c0 Delete type=3 #142 +2024/03/19-08:59:49.436163 7fe1956006c0 Delete type=0 #144 +2024/03/19-09:13:11.455720 7fe18fe006c0 Level-0 table #149: started +2024/03/19-09:13:11.455760 7fe18fe006c0 Level-0 table #149: 0 bytes OK +2024/03/19-09:13:11.463106 7fe18fe006c0 Delete type=0 #147 +2024/03/19-09:13:11.469442 7fe18fe006c0 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 2a18d89..a11f37c 100644 --- a/packs/traits/LOG.old +++ b/packs/traits/LOG.old @@ -1,7 +1,7 @@ -2024/03/15-16:29:29.474381 7f7df34006c0 Recovering log #128 -2024/03/15-16:29:29.484271 7f7df34006c0 Delete type=3 #126 -2024/03/15-16:29:29.484356 7f7df34006c0 Delete type=0 #128 -2024/03/15-16:35:28.390972 7f7debe006c0 Level-0 table #133: started -2024/03/15-16:35:28.391026 7f7debe006c0 Level-0 table #133: 0 bytes OK -2024/03/15-16:35:28.397167 7f7debe006c0 Delete type=0 #131 -2024/03/15-16:35:28.411153 7f7debe006c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) +2024/03/19-08:26:23.614041 7fe1974006c0 Recovering log #140 +2024/03/19-08:26:23.624059 7fe1974006c0 Delete type=3 #138 +2024/03/19-08:26:23.624114 7fe1974006c0 Delete type=0 #140 +2024/03/19-08:59:38.622981 7fe18fe006c0 Level-0 table #145: started +2024/03/19-08:59:38.623003 7fe18fe006c0 Level-0 table #145: 0 bytes OK +2024/03/19-08:59:38.629342 7fe18fe006c0 Delete type=0 #143 +2024/03/19-08:59:38.636106 7fe18fe006c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) diff --git a/packs/traits/MANIFEST-000134 b/packs/traits/MANIFEST-000146 similarity index 73% rename from packs/traits/MANIFEST-000134 rename to packs/traits/MANIFEST-000146 index 303ed16..4d61dec 100644 Binary files a/packs/traits/MANIFEST-000134 and b/packs/traits/MANIFEST-000146 differ diff --git a/postcss/ecryme.css b/postcss/ecryme.css index d3571b5..a996adc 100644 --- a/postcss/ecryme.css +++ b/postcss/ecryme.css @@ -1265,6 +1265,7 @@ ul, li { min-width: 12rem; } .item-name-label-short { + margin-top: 4px; flex-grow:1; max-width: 4rem; min-width: 4rem; @@ -1275,6 +1276,16 @@ ul, li { max-width: 6rem; min-width: 6rem; } +.item-name-label-medium2 { + margin-top: 4px; + flex-grow:0; + max-width: 10rem; + min-width: 10rem; +} +.item-name-label-free { + margin-top: 4px; + align-self: flex-start; +} .item-name-label-long2 { margin-top: 4px; flex-grow:2; @@ -1287,10 +1298,17 @@ ul, li { min-width: 9rem; } .item-field-label-short { + margin-top: 4px; flex-grow:1; max-width: 4rem; min-width: 4rem; } +.item-field-label-short-header { + margin-top: 4px; + flex-grow:1; + max-width: 2.2rem; + min-width: 2.2rem; +} .item-field-label-medium { flex-grow:1; max-width: 6rem; @@ -1331,6 +1349,11 @@ ul, li { .flexrow-no-expand { flex-grow: 0; } +.flexrow-start { + justify-content: flex-start; + align-content: flex-start; + align-self: flex-start; +} .item-input-small { max-width: 16px; max-height: 12px; diff --git a/styles/ecryme.css b/styles/ecryme.css index b63cfdc..4970d7b 100644 --- a/styles/ecryme.css +++ b/styles/ecryme.css @@ -1245,6 +1245,7 @@ ul, li { min-width: 12rem; } .item-name-label-short { + margin-top: 4px; flex-grow:1; max-width: 4rem; min-width: 4rem; @@ -1255,6 +1256,16 @@ ul, li { max-width: 6rem; min-width: 6rem; } +.item-name-label-medium2 { + margin-top: 4px; + flex-grow:0; + max-width: 10rem; + min-width: 10rem; +} +.item-name-label-free { + margin-top: 4px; + align-self: flex-start; +} .item-name-label-long2 { margin-top: 4px; flex-grow:2; @@ -1267,10 +1278,17 @@ ul, li { min-width: 9rem; } .item-field-label-short { + margin-top: 4px; flex-grow:1; max-width: 4rem; min-width: 4rem; } +.item-field-label-short-header { + margin-top: 4px; + flex-grow:1; + max-width: 2.2rem; + min-width: 2.2rem; +} .item-field-label-medium { flex-grow:1; max-width: 6rem; @@ -1311,6 +1329,11 @@ ul, li { .flexrow-no-expand { flex-grow: 0; } +.flexrow-start { + justify-content: flex-start; + align-content: flex-start; + align-self: flex-start; +} .item-input-small { max-width: 16px; max-height: 12px; diff --git a/system.json b/system.json index 8d0c7e8..76ac269 100644 --- a/system.json +++ b/system.json @@ -123,7 +123,7 @@ }, "title": "Ecryme, le Jeu de Rôles", "url": "https://www.uberwald.me/gitea/public/fvtt-ecryme", - "version": "11.0.38", - "download": "https://www.uberwald.me/gitea/public/fvtt-ecryme/archive/fvtt-ecryme-v11.0.38.zip", + "version": "11.0.39", + "download": "https://www.uberwald.me/gitea/public/fvtt-ecryme/archive/fvtt-ecryme-v11.0.39.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 197b048..a65d5d6 100644 --- a/template.json +++ b/template.json @@ -28,6 +28,7 @@ "skills": { "physical": { "name": "ECRY.ui.physical", + "pnjvalue": 0, "skilllist": { "athletics": { "name": "ECRY.ui.athletics", @@ -58,6 +59,7 @@ }, "mental": { "name": "ECRY.ui.mental", + "pnjvalue": 0, "skilllist": { "anthropomecanology": { "name": "ECRY.ui.anthropomecanology", @@ -88,6 +90,7 @@ }, "social": { "name": "ECRY.ui.social", + "pnjvalue": 0, "skilllist": { "quibbling": { "name": "ECRY.ui.quibbling", diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index 1bc0014..228df18 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -15,29 +15,40 @@
@@ -74,10 +85,33 @@