From 1d0d123947252ae3ab3f00494dc830640b8ac3dc Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Fri, 25 Aug 2023 09:09:21 +0200 Subject: [PATCH] Various fixes in equipment, biodata --- README.md | 2 +- lang/en.json | 7 +- lang/fr.json | 7 +- modules/actors/ecryme-actor-sheet.js | 2 +- modules/actors/ecryme-actor.js | 2 +- packs/equipment/{000072.log => 000092.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 14 +-- packs/equipment/LOG.old | 14 +-- .../{MANIFEST-000070 => MANIFEST-000090} | Bin 173 -> 173 bytes packs/help/{000008.log => 000028.log} | 0 packs/help/CURRENT | 2 +- packs/help/LOG | 16 +-- packs/help/LOG.old | 13 ++- .../help/{MANIFEST-000006 => MANIFEST-000026} | Bin 161 -> 161 bytes packs/maneuvers/{000072.log => 000092.log} | 0 packs/maneuvers/CURRENT | 2 +- packs/maneuvers/LOG | 14 +-- packs/maneuvers/LOG.old | 14 +-- .../{MANIFEST-000070 => MANIFEST-000090} | Bin 168 -> 168 bytes .../specialisation/{000072.log => 000092.log} | 0 packs/specialisation/CURRENT | 2 +- packs/specialisation/LOG | 14 +-- packs/specialisation/LOG.old | 14 +-- .../{MANIFEST-000070 => MANIFEST-000090} | Bin 170 -> 170 bytes packs/traits/{000072.log => 000092.log} | 0 packs/traits/CURRENT | 2 +- packs/traits/LOG | 14 +-- packs/traits/LOG.old | 14 +-- .../{MANIFEST-000070 => MANIFEST-000090} | Bin 170 -> 170 bytes postcss/ecryme.css | 4 + styles/ecryme.css | 4 + system.json | 4 +- template.json | 1 + templates/actors/actor-sheet.hbs | 101 ++++-------------- 35 files changed, 125 insertions(+), 160 deletions(-) rename packs/equipment/{000072.log => 000092.log} (100%) rename packs/equipment/{MANIFEST-000070 => MANIFEST-000090} (73%) rename packs/help/{000008.log => 000028.log} (100%) rename packs/help/{MANIFEST-000006 => MANIFEST-000026} (79%) rename packs/maneuvers/{000072.log => 000092.log} (100%) rename packs/maneuvers/{MANIFEST-000070 => MANIFEST-000090} (76%) rename packs/specialisation/{000072.log => 000092.log} (100%) rename packs/specialisation/{MANIFEST-000070 => MANIFEST-000090} (75%) rename packs/traits/{000072.log => 000092.log} (100%) rename packs/traits/{MANIFEST-000070 => MANIFEST-000090} (75%) diff --git a/README.md b/README.md index 2111399..e3acb18 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The game system in Foundry offers the following features : - Weapon rolls - Trait management, with Spleen and Ideal also. - Compendiums of items for the game -- + ![System Snapshot](https://www.lahiette.com/leratierbretonnien/wp-content/uploads/2023/08/ecryme_snapshot_01.webp "System Snapshot") diff --git a/lang/en.json b/lang/en.json index 4016283..052097b 100644 --- a/lang/en.json +++ b/lang/en.json @@ -51,6 +51,7 @@ "notenoughdice": "Execution and Preservation must have 2 dices allocated" }, "ui": { + "equipmentfree": "Equipments (free input)", "traitType": "Trait type", "niveauTrait": "Trait level", "weight": "Weight", @@ -160,7 +161,11 @@ "ideals": "Ideals", "politic": "Political ideal", "boheme": "Boheme", - "annencybonus": "Annency bonus" + "annencybonus": "Annency bonus", + "bornplace": "Born place", + "residence": "Residence", + "origin": "Origin", + "childhood": "Childhood" } } } \ No newline at end of file diff --git a/lang/fr.json b/lang/fr.json index 808111d..2f00167 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -52,6 +52,7 @@ "notenoughdice": "L'Accomplissement et la Préservation doivent avoir 2 dés chacun" }, "ui": { + "equipmentfree": "Equipements (saisie libre)", "traitType": "Type de trait", "niveauTrait": "Niveau du trait", "effect": "Incidence", @@ -161,7 +162,11 @@ "ideals": "Idéaux", "politic": "Idéaux politiques", "boheme": "Bohême", - "annencybonus": "Bonus d'Anence" + "annencybonus": "Bonus d'Anence", + "bornplace": "Lieu de naissance", + "residence": "Résidence", + "origin": "Origine", + "childhood": "Enfance" } } } \ No newline at end of file diff --git a/modules/actors/ecryme-actor-sheet.js b/modules/actors/ecryme-actor-sheet.js index 92d1fcb..372610b 100644 --- a/modules/actors/ecryme-actor-sheet.js +++ b/modules/actors/ecryme-actor-sheet.js @@ -46,7 +46,7 @@ export class EcrymeActorSheet extends ActorSheet { maneuvers: this.actor.getManeuvers(), impactsMalus: this.actor.getImpactsMalus(), archetype: duplicate(this.actor.getArchetype()), - equipements: this.actor.getEquipments(), + equipments: this.actor.getEquipments(), hasCephaly: EcrymeUtility.hasCephaly(), hasBoheme: EcrymeUtility.hasBoheme(), hasAmertume: EcrymeUtility.hasAmertume(), diff --git a/modules/actors/ecryme-actor.js b/modules/actors/ecryme-actor.js index d7adc5e..13a27d5 100644 --- a/modules/actors/ecryme-actor.js +++ b/modules/actors/ecryme-actor.js @@ -200,7 +200,7 @@ export class EcrymeActor extends Actor { /* ------------------------------------------- */ getEquipments() { - return this.items.filter(item => item.type == 'equipement') + return this.items.filter(item => item.type == 'equipment') } /* ------------------------------------------- */ diff --git a/packs/equipment/000072.log b/packs/equipment/000092.log similarity index 100% rename from packs/equipment/000072.log rename to packs/equipment/000092.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index bcf1079..2f2c868 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000070 +MANIFEST-000090 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index 69654f7..9ec9830 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,7 +1,7 @@ -2023/08/22-08:18:29.415756 7f4f609fd6c0 Recovering log #68 -2023/08/22-08:18:29.426603 7f4f609fd6c0 Delete type=3 #66 -2023/08/22-08:18:29.426655 7f4f609fd6c0 Delete type=0 #68 -2023/08/22-08:21:44.533362 7f4ccb7fe6c0 Level-0 table #73: started -2023/08/22-08:21:44.533404 7f4ccb7fe6c0 Level-0 table #73: 0 bytes OK -2023/08/22-08:21:44.540850 7f4ccb7fe6c0 Delete type=0 #71 -2023/08/22-08:21:44.560122 7f4ccb7fe6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +2023/08/25-09:06:43.291745 7f42affff6c0 Recovering log #88 +2023/08/25-09:06:43.308894 7f42affff6c0 Delete type=3 #86 +2023/08/25-09:06:43.308951 7f42affff6c0 Delete type=0 #88 +2023/08/25-09:09:02.388289 7f42ae7fc6c0 Level-0 table #93: started +2023/08/25-09:09:02.388354 7f42ae7fc6c0 Level-0 table #93: 0 bytes OK +2023/08/25-09:09:02.396757 7f42ae7fc6c0 Delete type=0 #91 +2023/08/25-09:09:02.413788 7f42ae7fc6c0 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 58de86d..2360901 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,7 +1,7 @@ -2023/08/17-08:30:06.224452 7fa0dcff96c0 Recovering log #64 -2023/08/17-08:30:06.244297 7fa0dcff96c0 Delete type=3 #62 -2023/08/17-08:30:06.244357 7fa0dcff96c0 Delete type=0 #64 -2023/08/17-08:31:03.278842 7f9e3ffff6c0 Level-0 table #69: started -2023/08/17-08:31:03.278870 7f9e3ffff6c0 Level-0 table #69: 0 bytes OK -2023/08/17-08:31:03.285336 7f9e3ffff6c0 Delete type=0 #67 -2023/08/17-08:31:03.285445 7f9e3ffff6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +2023/08/25-08:56:40.355200 7f45449ff6c0 Recovering log #84 +2023/08/25-08:56:40.368438 7f45449ff6c0 Delete type=3 #82 +2023/08/25-08:56:40.368595 7f45449ff6c0 Delete type=0 #84 +2023/08/25-09:05:19.712351 7f42ae7fc6c0 Level-0 table #89: started +2023/08/25-09:05:19.712385 7f42ae7fc6c0 Level-0 table #89: 0 bytes OK +2023/08/25-09:05:19.719168 7f42ae7fc6c0 Delete type=0 #87 +2023/08/25-09:05:19.719526 7f42ae7fc6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000070 b/packs/equipment/MANIFEST-000090 similarity index 73% rename from packs/equipment/MANIFEST-000070 rename to packs/equipment/MANIFEST-000090 index fd08441e356f6c9505dbbbfafe0e1fc3bf5cf037..752f7067e152ff2c7e1adb5c68b6112a19869b5a 100644 GIT binary patch delta 39 qcmZ3>xR!B3ufm6y>ZzOzj7-s-49qbs>lkek42?ki7$83m$Oi!2X9)!W delta 39 qcmZ3>xR!B3uL2Ll!Fo;xMkaSo24)YIb&O(c%r+pt2axXtC5QrNCnk delta 37 pcmZ3*xQcN?k6diay$lWpMkaSo24)Wyuf^RJb3j}VAlHk<3joQB2;~3( diff --git a/postcss/ecryme.css b/postcss/ecryme.css index 602b42e..d3571b5 100644 --- a/postcss/ecryme.css +++ b/postcss/ecryme.css @@ -1321,6 +1321,10 @@ ul, li { min-width:2rem; max-width: 2rem; } +.item-controls-fixed-full { + min-width:3rem; + max-width: 3rem; +} .attribute-label { font-weight: bold; } diff --git a/styles/ecryme.css b/styles/ecryme.css index c176cf0..b63cfdc 100644 --- a/styles/ecryme.css +++ b/styles/ecryme.css @@ -1301,6 +1301,10 @@ ul, li { min-width:2rem; max-width: 2rem; } +.item-controls-fixed-full { + min-width:3rem; + max-width: 3rem; +} .attribute-label { font-weight: bold; } diff --git a/system.json b/system.json index 0cd871a..edd6f72 100644 --- a/system.json +++ b/system.json @@ -111,7 +111,7 @@ }, "title": "Ecryme, le Jeu de Rôles", "url": "https://www.uberwald.me/gitea/uberwald/fvtt-ecryme", - "version": "11.0.20", - "download": "https://www.uberwald.me/gitea/uberwald/fvtt-ecryme/archive/fvtt-ecryme-v11.0.20.zip", + "version": "11.0.21", + "download": "https://www.uberwald.me/gitea/uberwald/fvtt-ecryme/archive/fvtt-ecryme-v11.0.21.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 f280409..8cc2da4 100644 --- a/template.json +++ b/template.json @@ -24,6 +24,7 @@ }, "core": { "subactors": [], + "equipmentfree": "", "skills": { "physical": { "name": "ECRY.ui.physical", diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index ae9911b..0a88ca2 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -19,9 +19,10 @@
 
{{#if spleen}} -
+
+ - +
{{/if}} @@ -30,9 +31,10 @@
 
{{#if ideal}} -
+
+ - +
{{/if}} @@ -273,57 +275,22 @@ {{!-- Equipement Tab --}} -
+
-

+

- {{editor equipementlibre target="system.equipementlibre" button=true owner=owner editable=editable}} + {{editor equipementlibre target="system.equipmentfree" button=true owner=owner editable=editable}}
  • -

    +

    - - - - - - - - -
    - -
    -
    • - {{#each armes as |arme key|}} -
  • - - {{arme.name}} - - - - -
     
    -
    - -
    -
    • - {{/each}} -
- -
    -
  • - -

    -     - - +
     
    @@ -331,11 +298,12 @@
    • - {{#each equipements as |equip key|}} + {{#each equipments as |equip key|}}
  • {{equip.name}} + {{equip.system.weight}}
     
    @@ -345,36 +313,6 @@ {{/each}}
-
    -
  • - -

    -     - - - -
     
    -
    - -
    - -
    • - {{#each sorts as |sort key|}} -
  • - - {{sort.name}} - - - -
     
    -
    - -
    -
    • - {{/each}} -
-
@@ -386,7 +324,7 @@
  • - +
    • @@ -395,22 +333,27 @@ +
  • + + +
  • - +
  • - +
  • - +