feat: separate skill value/max (transcendence pool vs level)

- skill.value = spendable transcendence pool (editable select)
- skill.max = max level (locked by default, unlock btn)
- computeRollFormula/computeResults/confront use skill.max
- clamp transcendence spend to skill.value
- resetTranscendence button in Bio&Notes
- v14 compat: duplicate→deepClone, mergeObject→spread, socket fixes
- Dialog v1 removed, DragDrop dedup, await fixes

.gitea/workflows/main.yml

@@ -1,54 +0,0 @@
-name: Release Creation
-
-on: 
-  release:
-    types: [published]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - run: echo "💡 The ${{ gitea.repository }} repository will cloned to the runner."
-    
-    #- uses: actions/checkout@v3
-    - uses: RouxAntoine/checkout@v3.5.4
-      with:
-        ref: 'master'
-
-    # get part of the tag after the `v`
-    - name: Extract tag version number
-      id: get_version
-      uses: battila7/get-version-action@v2
-
-    # Substitute the Manifest and Download URLs in the module.json
-    - name: Substitute Manifest and Download Links For Versioned Ones
-      id: sub_manifest_link_version
-      uses: microsoft/variable-substitution@v1
-      with:
-        files: 'system.json'
-      env:
-        version: ${{steps.get_version.outputs.version-without-v}}
-        url: https://www.uberwald.me/gitea/public/fvtt-ecryme
-        manifest: https://www.uberwald.me/gitea/public/fvtt-ecryme/releases/latest/system.json
-        download: https://www.uberwald.me/gitea/public/fvtt-ecryme/releases/download/${{github.event.release.tag_name}}/fvtt-ecryme.zip
-    
-    # Create a zip file with all files required by the module to add to the release
-    - run: |
-         apt update -y
-         apt install -y zip
-
-    - run: zip -r ./fvtt-ecryme.zip system.json template.json README.md LICENSE.txt fonts/ images/ lang/ modules/ packs/ styles/ templates/ translated/
-    
-    - name: setup go
-      uses: https://github.com/actions/setup-go@v4
-      with:
-        go-version: '>=1.20.1'
-    
-    - name: Use Go Action  
-      id: use-go-action
-      uses: https://gitea.com/actions/release-action@main
-      with:
-        files: |-
-          ./fvtt-ecryme.zip
-          system.json
-        api_key: '${{secrets.RELEASE_TOKEN_UBERWALD}}'

.gitea/workflows/release.yaml

@@ -0,0 +1,71 @@
+name: Release Creation
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "💡 The ${{ gitea.repository }} repository will be cloned to the runner."
+
+      - uses: https://github.com/RouxAntoine/checkout@v3.5.4
+
+      # get part of the tag after the `v`
+      - name: Extract tag version number
+        id: get_version
+        uses: https://github.com/battila7/get-version-action@v2
+
+      # Substitute the Manifest and Download URLs in the system.json
+      - name: Substitute Manifest and Download Links For Versioned Ones
+        id: sub_manifest_link_version
+        uses: https://github.com/microsoft/variable-substitution@v1
+        with:
+          files: "system.json"
+        env:
+          version: ${{steps.get_version.outputs.version-without-v}}
+          url: https://www.uberwald.me/gitea/${{gitea.repository}}
+          manifest: https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/latest/system.json
+          download: https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/fvtt-ecryme-${{github.event.release.tag_name}}.zip
+
+      # Build CSS from LESS
+      - uses: https://github.com/actions/setup-node@v4
+        with:
+          node-version: "20"
+      - run: npm install && npm run build
+
+      # Create a zip file with all files required by the system to add to the release
+      - run: |
+          apt update -y
+          apt install -y zip jq
+
+      - run: zip -r ./fvtt-ecryme-${{github.event.release.tag_name}}.zip system.json README.md LICENSE.md changelog.md css/ fonts/ images/ lang/ modules/ styles/ packs/ templates/ translated/ welcome-message-ecryme.html
+
+      - name: Upload release assets
+        env:
+          GITEA_TOKEN: ${{ secrets.ALLOW_PUSH_RELEASE }}
+          TAG_NAME: ${{ github.event.release.tag_name }}
+          REPO: ${{ gitea.repository }}
+        run: |
+          RELEASE_ID=$(curl -s -H "Authorization: token $GITEA_TOKEN" \
+            "https://www.uberwald.me/gitea/api/v1/repos/$REPO/releases/tags/$TAG_NAME" | jq -r '.id')
+          curl -s -H "Authorization: token $GITEA_TOKEN" \
+            -H "Content-Type: application/zip" \
+            --data-binary @./fvtt-ecryme-$TAG_NAME.zip \
+            "https://www.uberwald.me/gitea/api/v1/repos/$REPO/releases/$RELEASE_ID/assets?name=fvtt-ecryme-$TAG_NAME.zip"
+          curl -s -H "Authorization: token $GITEA_TOKEN" \
+            -H "Content-Type: application/json" \
+            --data-binary @./system.json \
+            "https://www.uberwald.me/gitea/api/v1/repos/$REPO/releases/$RELEASE_ID/assets?name=system.json"
+
+      - name: Publish to Foundry server
+        uses: https://github.com/djlechuck/foundryvtt-publish-package-action@v1
+        with:
+          token: ${{ secrets.FOUNDRYVTT_RELEASE_TOKEN }}
+          id: "fvtt-ecryme"
+          version: ${{steps.get_version.outputs.version-without-v}}
+          manifest: "https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/latest/system.json"
+          notes: "https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/fvtt-ecryme-${{github.event.release.tag_name}}.zip"
+          compatibility-minimum: "13"
+          compatibility-verified: "14"

.gitignore

@@ -1 +1,3 @@
 .history/
+node_modules/
+css/ecryme.css

AGENTS.md

@@ -0,0 +1,54 @@
+# Ecryme (FoundryVTT) — agent notes
+
+**This is a FoundryVTT Game System** (not a module), id `fvtt-ecryme`. Compatible with Foundry v13–v14. Requires `babele` and `lib-wrapper`.
+
+## Quick commands
+
+| Command | What |
+|---------|------|
+| `npm run build` | Compile `styles/ecryme.less` → `css/ecryme.css` via Gulp |
+| `npm run watch` | Watch `styles/**/*.less` and rebuild |
+
+No other npm scripts exist. **No tests, no linter, no typechecker, no TypeScript.** Pure JS ES modules, no bundling.
+
+## Project structure
+
+```
+modules/          # JS source (loaded directly by Foundry, no build step)
+  ecryme-main.js  # Entry point — registers documents, sheets, hooks, templates
+  actors/         # Actor document + sheet classes (pc, npc, annency)
+  items/          # Item document + sheet classes (equipment, weapon, trait, spec, maneuver)
+  models/         # Foundry DataModels (extends TypeDataModel) — schema definitions
+  dialogs/        # Roll/confrontation dialog classes
+  app/            # Combat, commands, hotbar, summary app
+  common/         # Config constants + utility helpers (798-line utility)
+templates/        # Handlebars sheets (actors/, items/, chat/, dialogs/)
+styles/           # LESS source files (ecryme.less imports all partials)
+lang/             # fr.json, en.json localization
+packs/            # LevelDB compendium packs (specialisation, equipment, traits, scenes, maneuvers, help)
+translated/fr/    # Babele translation JSON files for compendium content
+images/           # Assets, icons, UI
+css/              # Compiled CSS output (committed despite being in .gitignore)
+```
+
+## Architecture
+
+- **App v1 sheets** (`foundry.appv1.sheets.ActorSheet`/`ItemSheet`), not ApplicationV2
+- **DataModels** replace the deprecated `template.json` (kept as `template.json.SAVED`)
+  - Actor types: `pc`, `npc`, `annency`
+  - Item types: `equipment`, `weapon`, `trait`, `specialization`, `maneuver`
+- ES module imports use relative paths with `.js` extension
+- Custom combat class extends `Combat` with its own initiative formula
+- Socket enabled (`"socket": true` in `system.json`)
+
+## Conventions (verified from codebase)
+
+- **JS files**: kebab-case (`ecryme-actor.js`)
+- **Classes**: PascalCase (`EcrymeActor`)
+- **Templates**: kebab-case `.hbs` (`actor-sheet.hbs`)
+- **Barrel files**: `_module.js`
+- **Hooks**: init → register classes/sheets/templates; ready → welcome msg/scene import; babele.init → register translation dir
+
+## Release
+
+Gitea CI (`.gitea/workflows/release.yaml`) triggers on published release. Zips the source tree directly — JS is used as-is, no build step for JS. CSS must be pre-compiled before release.

LICENSE.md

@@ -0,0 +1,393 @@
+Creative Commons Legal Code
+
+CC BY-NC-SA 4.0
+
+Attribution-NonCommercial-ShareAlike 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution-NonCommercial-ShareAlike 4.0 International Public License
+("Public License"). To the extent this Public License may be interpreted as
+a contract, You are granted the Licensed Rights in consideration of Your
+acceptance of these terms and conditions, and the Licensor grants You
+such rights in consideration of benefits the Licensor receives from
+making the Licensed Material available under these terms and
+conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright and
+     Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. BY-NC-SA Compatible License means a license listed at
+     creativecommons.org/compatiblelicenses, approved by Creative
+     Commons as essentially the equivalent of this Public License.
+
+  d. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation, performance,
+     broadcast, sound recording, and Sui Generis Database Rights, without
+     regard to how the rights are labeled or categorized. For purposes of
+     this Public License, the rights specified in Section 2(b)(1)-(2) are
+     not Copyright and Similar Rights.
+
+  e. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright Treaty
+     adopted on December 20, 1996, and/or similar international agreements.
+
+  f. Exceptions and Limitations means fair use, fair dealing, and/or any
+     other exception or limitation to Copyright and Similar Rights that
+     apply to Your use of the Licensed Material.
+
+  g. Licensed Material means the artistic or literary work, database, or
+     other material to which the Licensor applied this Public License.
+
+  h. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which have as their
+     object the Licensed Material and which include all Copyright and
+     Similar Rights that apply to Your use of the Licensed Material and
+     that the Licensor has authority to license.
+
+  i. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  j. NonCommercial means not primarily intended for or directed towards
+     commercial advantage or monetary compensation. For purposes of
+     this Public License, the exchange of the Licensed Material for a
+     fee or other remuneration is considered NonCommercial if the fee or
+     remuneration is solely intended to compensate the Licensor for the
+     Licensor's time and effort in producing the Licensed Material or to
+     provide a financial contribution to the Licensor's non-commercial
+     operations, and the exchange is separate and independent from the
+     Licensed Material such that the Licensor's commercial operations are
+     not enhanced by the exchange.
+
+  k. Original Work means the work to which the Licensor applied this
+     Public License.
+
+  l. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such as
+     reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the public
+     may access the material from a place and at a time individually chosen
+     by them.
+
+  m. Shared with You means the Licensed Material has been provided to
+     You by the Licensor, or by a recipient of the Licensed Material from
+     the Licensor, under this Public License.
+
+  n. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of the
+     Council of 11 March 1996 on the legal protection of databases, as
+     amended and/or succeeded, as well as other essentially equivalent rights
+     anywhere in the world.
+
+  o. This Public License does not apply to Sui Generis Database Rights to
+     the extent they do not fall under Section 2(a)(5).
+
+  p. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning in the
+     context of Your acting as the Licensor.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+     1. Subject to the terms and conditions of this Public License, the
+        Licensor hereby grants You a worldwide, royalty-free, non-sublicensable,
+        non-exclusive, irrevocable license to exercise the Licensed Rights in
+        the Licensed Material to:
+
+        a. reproduce and Share the Licensed Material, in whole or in part;
+
+        b. create and reproduce Adapted Material and Share Adapted Material.
+
+     2. Exceptions and Limitations. For the avoidance of doubt, where
+        Exceptions and Limitations apply to Your use, this Public License
+        does not apply, and You do not need to comply with its terms and
+        conditions.
+
+     3. Term. The term of this Public License is specified in Section 6(a).
+
+     4. Media and formats; technical modifications allowed. The Licensor
+        authorizes You to exercise the Licensed Rights in all media and
+        formats whether now known or hereafter created, and to make technical
+        modifications necessary to do so. The Licensor waives and/or agrees
+        not to assert any right or authority to forbid You from making
+        technical modifications necessary to exercise the Licensed Rights,
+        including technical modifications necessary to circumvent Effective
+        Technological Measures. For purposes of this Public License, simply as a
+        consequence of modifying the Licensed Material, You do not become a
+        Licensor of the Licensed Material, and the Adapted Material You create
+        is not subject to the terms and conditions of this Public License.
+
+     5. Downstream recipients.
+
+        a. Offer from the Licensor -- Licensed Material: The Licensor
+           offers to the recipient of Licensed Material a license to the
+           Licensed Material on the same terms and conditions as granted
+           to You under this Public License.
+
+        b. Additional offer from the Licensor -- Adapted Material: The
+           Licensor offers to the recipient of Adapted Material a license
+           to the Adapted Material on the terms and conditions of the
+           Adapter's License You apply to Your Adapted Material.
+
+        c. No downstream restrictions. You may not offer or impose any
+           additional or different terms or conditions on, or apply any
+           Effective Technological Measures to, the Licensed Material if doing
+           so restricts exercise of the Licensed Rights by any recipient of
+           the Licensed Material.
+
+  b. No endorsement. Nothing in this Public License constitutes or may be
+     construed as permission to assert or imply that You are, or that Your
+     use of the Licensed Material is, connected with, or sponsored by, the
+     Licensor, or any other person.
+
+  c. Fair use; other user rights. Nothing in this Public License is intended
+     to reduce, limit, or restrict any uses free from copyright or rights
+     arising from limitations or exceptions that are provided for in
+     connection with the copyright and other similar rights applicable to
+     the particular use or which cannot be waived.
+
+  d. Patent and trademark notice. This Public License does not grant
+     permission to use the trade name, trademark, service mark, or similar
+     branding of the Licensor, except as required for reasonable and customary
+     notice of attribution when You engage in the reproduction or distribution
+     of the Licensed Material. This Public License does not grant permission to
+     use the patent rights of the Licensor.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions:
+
+  a. Attribution.
+
+     1. If You Share the Licensed Material (including in modified form), You
+        must:
+
+        a. retain the following if it is supplied by the Licensor with the
+           Licensed Material:
+
+           i. identification of the creator(s) of the Licensed Material and
+               any others designated to receive attribution, in any reasonable
+               manner requested by the Licensor (including by pseudonym if
+               designated);
+
+          ii. a copyright notice;
+
+         iii. a notice that refers to this Public License;
+
+         iv. a notice that refers to the disclaimer of warranties;
+
+          v. a URI or hyperlink to the Licensed Material to the extent
+              reasonably practicable;
+
+        b. indicate if You modified the Licensed Material and retain an
+           indication of any previous modifications; and
+
+        c. indicate the Licensed Material is licensed under this Public
+           License, and include the text of, or the URI or hyperlink to, this
+           Public License.
+
+     2. You may satisfy the conditions in Section 3(a)(1) in any reasonable
+        manner based on the medium, means, and context in which You Share the
+        Licensed Material. For example, it may be reasonable to satisfy the
+        conditions by providing a URI or hyperlink to a resource that includes
+        the required information.
+
+     3. If requested by the Licensor, You must remove any of the information
+        required by Section 3(a)(1)(A) to the extent reasonably practicable.
+
+  b. NonCommercial.
+     You may not exercise the Licensed Rights for Commercial Purposes.
+
+  c. ShareAlike.
+     In addition to the conditions in Section 3(a) and (b), if You Share
+     Adapted Material You produce, the following conditions also apply:
+
+     1. The Adapter's License You apply must be a BY-NC-SA Compatible License
+        with terms that are equivalent to this Public License.
+
+     2. You must include the text of, or the URI or hyperlink to, the
+        Adapter's License You apply. You may satisfy this condition in any
+        reasonable manner based on the medium, means, and context in which You
+        Share Adapted Material.
+
+     3. You may not offer or impose any additional or different terms or
+        conditions on, or apply any Effective Technological Measures to,
+        Adapted Material that restrict exercise of the rights granted under
+        the Adapter's License You apply.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that apply to
+Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right to
+     extract, reuse, reproduce, and Share all or a substantial portion of the
+     contents of the database for NonCommercial purposes only;
+
+  b. if You include all or a substantial portion of the database contents in
+     Adapted Material, You must comply with the conditions in Section
+     3(a) and (c) of this Public License.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE EXTENT
+     POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS AND AS-AVAILABLE,
+     AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND, EXPRESS, IMPLIED,
+     STATUTORY OR OTHERWISE, AND DISCLAIMS ALL RESPONSIBILITY FOR ANY HARM OR
+     DAMAGE ARISING OUT OF OR IN CONNECTION WITH THE LICENSED MATERIAL OR
+     THIS PUBLIC LICENSE, INCLUDING WITHOUT LIMITATION DAMAGES FOR LOSS OF
+     INCOME, PROFITS, BUSINESS INTERRUPTION, OR OTHER PECUNIARY LOSS, OR FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE, OR EXEMPLARY
+     DAMAGES, WHETHER ARISING UNDER CONTRACT, STRICT LIABILITY, OR TORT
+     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY FROM THE USE OF THE
+     LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGES.
+
+  b. WHERE THE LICENSED RIGHTS INCLUDE SUI GENERIS DATABASE RIGHTS THAT
+     APPLY TO YOUR USE OF THE LICENSED MATERIAL, THE LICENSOR MAKES NO
+     REPRESENTATIONS OR WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+     AS TO THE DATA INCLUDED IN THE LICENSED MATERIAL; THE LICENSOR MAKES NO
+     REPRESENTATIONS OR WARRANTIES AS TO THE ACCURACY OR COMPLETENESS OF THE
+     DATA; THE LICENSOR DISCLAIMS ALL LIABILITY FOR ANY HARM OR DAMAGE ARISING
+     OUT OF INACCURACIES OR OMITTIONS IN THE DATA; AND THE LICENSOR MAKES NO
+     COMMITMENT TO CONTINUE TO SUPPLY, MAINTAIN, OR CORRECT THE DATA.
+
+  c. OTHER THAN AS EXPRESSLY AGREED TO BY THE PARTIES IN WRITING, THE LICENSOR
+     PROVIDES THE LICENSED MATERIAL ON AN "AS-IS" AND "AS-AVAILABLE" BASIS AND
+     WITHOUT CONDITIONS OR WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED,
+     INCLUDING, WITHOUT LIMITATION, ANY WARRANTY OF TITLE, MERCHANTABILITY,
+     OR FITNESS FOR A PARTICULAR PURPOSE. YOU BEAR THE SOLE RISK OF DETERMINING
+     WHETHER THE LICENSED MATERIAL IS SUITABLE FOR YOUR PURPOSES AND OF THE
+     CONSEQUENCES OF USING THE LICENSED MATERIAL. IN ALL CIRCUMSTANCES, UNLESS
+     OTHERWISE AGREED IN WRITING, THE LICENSOR SHALL NOT BE LIABLE TO YOU OR
+     TO ANY OTHER PARTY FOR ANY DAMAGES, INCLUDING WITHOUT LIMITATION SPECIAL OR
+     CONSEQUENTIAL DAMAGES. IN NO EVENT SHALL THE LICENSOR BE LIABLE FOR ANY
+     DIRECT, INDIRECT, PUNITIVE, OR INCIDENTAL DAMAGES ARISING OUT OF THIS
+     PUBLIC LICENSE OR THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+  d. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL THE
+     LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT
+     LIMITATION, NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, OR EXEMPLARY DAMAGES, INCLUDING WITHOUT
+     LIMITATION DAMAGES FOR LOSS OF PROFITS, DATA, OR GOODWILL, EVEN IF THE
+     LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the duration of any applicable
+     copyright and Similar Rights licensed here under. However, if You
+     violate this Public License, the Licensor's grant of rights to You
+     under this Public License terminates automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+     1. automatically as of the date the violation is cured, provided it is
+        cured within 30 days of Your discovery of the violation; or
+
+     2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any right
+     the Licensor may have to seek remedies for Your violation of this Public
+     License.
+
+  c. For the avoidance of doubt, the Licensor may also terminate this Public
+     License for all uses of the Licensed Material by You if You fail to
+     comply with the Licensor's requirement to remove a reference to the
+     Licensor or attribution information, as requested under Section
+     3(a)(1)(A)(v), from any cue or companion material to the Licensed
+     Material.
+
+  d. Who may terminate this Public License? Only the Licensor or an
+     individual or entity authorized to act on behalf of the Licensor.
+
+
+Section 7 -- Other Rights.
+
+  a. Moral rights, such as the right of integrity, are not licensed under
+     this Public License, nor are publicity, privacy, and/or other similar
+     personality rights; however, to the extent possible, the Licensor waives
+     and/or agrees not to assert any such rights held by the Licensor to the
+     extent necessary to allow You to exercise the Licensed Rights, but not
+     otherwise.
+
+  b. Patent rights. This Public License does not grant permissions to use,
+     sell, or license patent claims or patented inventions in any work
+     based on the Licensed Material, and the Licensor reserves all patent and
+     similar rights in the Licensed Material.
+
+  c. Trademark rights. This Public License does not grant permissions to
+     use the trade name, trademark, service mark, or other similar branding
+     of the Licensor, except as required for reasonable and customary use in
+     describing the origin of the Licensed Material and describing the use
+     of the Licensed Material, including Modified Versions of You.
+
+  d. No additional restrictions. You may not impose any technological
+     restrictions or attempt to impose technological restrictions through legal
+     or other means that restrict other Users from exercising the Licensed
+     Rights.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and shall be
+     interpreted not to, create or imply any grant of patent or trademark
+     rights to You.
+
+  b. This Public License does not address the permissions and restrictions
+     that apply to Private Rights or Other Rights, as such terms are defined
+     under Section 2(a)(4).
+
+  c. No waiver. Any failure by the Licensor to comply with a term or
+     condition of this Public License or to seek remedies for violation of
+     this Public License does not constitute a waiver of the Licensor's
+     right to enforce that term, condition, or remedy.
+
+  d. Severability. If any provision of this Public License is invalid or
+     unenforceable under applicable law, it shall not affect the validity or
+     enforceability of the remainder of the terms and conditions of this
+     Public License without that provision.
+
+  e. No surrender of rights. This Public License does not require You or any
+     User to surrender any rights, including moral rights or copyright,
+     they may have in the Licensed Material or Adapted Material.
+
+  f. All rights not explicitly granted. Any use of the Licensed Material
+     not expressly permitted by this Public License is reserved and
+     prohibited.

LICENSE.txt

@@ -1,7 +0,0 @@
-Copyright 2023 Open Sesame Games
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -28,7 +28,22 @@ The game system in Foundry offers the following features :
 
 English translation by Conal Longden and Ian McClung
 
-# Copyright mentions
+# License
+
+This work is licensed under **Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International (CC BY-NC-SA 4.0)**.
+
+You are free to:
+- **Share** — copy and redistribute the material in any medium or format
+- **Adapt** — remix, transform, and build upon the material
+
+Under the following terms:
+- **Attribution** — You must give appropriate credit, provide a link to the license, and indicate if changes were made
+- **NonCommercial** — You may not use the material for commercial purposes
+- **ShareAlike** — If you remix, transform, or build upon the material, you must distribute your contributions under the same license
+
+For the full legal text, see [LICENSE.md](LICENSE.md).
+
+## Copyright mentions
 
 Copyright 2023 Open Sesame Games
 All rights reserved

changelog.md

@@ -1,3 +1,27 @@
+## [Version à venir] - Migration DataModels
+
+### 🔄 Changements majeurs
+- **Migration complète vers DataModels** : Le système n'utilise plus `template.json` pour définir les structures de données
+- Tous les types d'acteurs (PC, NPC, Annency) utilisent maintenant des DataModels
+- Tous les types d'items (Equipment, Weapon, Trait, Specialization, Maneuver, Scar, Annency, Boheme, Contact, Confrontation) utilisent maintenant des DataModels
+
+### ✨ Améliorations
+- Validation automatique des types de données
+- Valeurs par défaut cohérentes pour tous les champs
+- Meilleure performance grâce aux optimisations internes de Foundry VTT
+- Code mieux organisé dans `modules/models/`
+
+### 🔧 Technique
+- Ajout du dossier `modules/models/` avec 14 fichiers DataModel
+- `template.json` est maintenant marqué comme deprecated mais conservé pour référence
+- Compatibilité ascendante : les données existantes sont automatiquement migrées
+
+### 📚 Documentation
+- Ajout d'un README dans `modules/models/` expliquant la structure et l'utilisation
+- Guide de développement pour ajouter de nouveaux types
+
+---
+
 v12.0.0
 
 - Support Foundry v11/v12

gulpfile.js

@@ -1,25 +1,31 @@
-var gulp = require('gulp');
+const gulp = require('gulp');
+const less = require('gulp-less');
 
-var postcss = require('gulp-postcss');
-
-var autoprefixer = require('autoprefixer');
-var cssnext = require('cssnext');
-var precss = require('precss');
-
-gulp.task('css', function () {
-
-  var processors = [
-    autoprefixer,
-    cssnext,
-    precss
-  ];
-
-  return gulp.src('./postcss/*.css')
-    .pipe(postcss(processors))
-    .pipe(gulp.dest('./styles'));
-});
+/* ----------------------------------------- */
+/*  Compile LESS
+/* ----------------------------------------- */
+function compileLESS() {
+  return gulp.src("styles/ecryme.less")
+    .pipe(less()).on('error', console.log.bind(console))
+    .pipe(gulp.dest("./css"));
+}
+const css = gulp.series(compileLESS);
 
+/* ----------------------------------------- */
+/*  Watch Updates
+/* ----------------------------------------- */
+const LESS_FILES = ["styles/**/*.less"];
 
 function watchUpdates() {
-  gulp.watch('./postcss/*.css', css);
+  gulp.watch(LESS_FILES, css);
 }
+
+/* ----------------------------------------- */
+/*  Export Tasks
+/* ----------------------------------------- */
+exports.default = gulp.series(
+  gulp.parallel(css),
+  watchUpdates
+);
+exports.css = css;
+exports.watchUpdates = watchUpdates;

lang/en.json

@@ -19,7 +19,8 @@
       "cephaly": "Cephaly",
       "boheme": "Boheme",
       "amertume": "Amertume",
-      "gamelevel": "Game level"
+      "gamelevel": "Game level",
+      "gamelevelhelp": "Choose the game level (Cogs, Cephaly, Boheme, Amertume)"
     },
     "chat": {
       "formula": "Formula",
@@ -42,15 +43,18 @@
       "cephaly-success-4": "Duration : 1 week - Impact : Light - Bonus : 2 - Elegy : 2",
       "cephaly-success-6": "Duration : 1 month - Impact : Serious - Bonus : 3 - Elegy : 3",
       "cephaly-success-8": "Duration : 1 year - Impact : Major - Bonus : 4 - Elegy : 4",
+      "cephaly-success-9": "Duration : Permanent - Impact : Major - Bonus : 4 - Elegy : 4",
       "cephaly-success-10": "Duration : Permanent - Impact : Dead - Bonus : 5 - Elegy : 5",
       "cephaly-failure-2": "Duration : 1 scene - Impact : Superficial - Malus : 1",
       "cephaly-failure-4": "Duration : 1 week - Impact : Light - Malus : 2",
       "cephaly-failure-6": "Duration : 1 month - Impact : Serious - Malus : 3",
       "cephaly-failure-8": "Duration : 1 year - Impact : Major - Malus : 4",
+      "cephaly-failure-9": "Duration : Permanent - Impact : Major - Malus : 4",
       "cephaly-failure-10": "Duration : Permanent - Impact : Death/Madness - Malus : 5"
     },
     "warn": {
-      "notenoughdice": "Execution and Preservation must have 2 dices allocated"
+      "notenoughdice": "Execution and Preservation must have 2 dices allocated",
+      "confrontalready": "Confrontation already in progress with this roll"
     },
     "ui": {
       "equipmentfree": "Equipments (free input)",
@@ -69,6 +73,10 @@
       "notes": "Notes",
       "bio": "Bio",
       "bionotes": "Bio&Notes",
+      "resetTranscendence": "Reset transcendence",
+      "transcendenceCurrent": "Current value",
+      "transcendenceMax": "Max value",
+      "toggleEditMax": "Edit max level",
       "skills": "Skills",
       "traits": "Traits",
       "equipment": "Equipment",
@@ -112,6 +120,7 @@
       "applyspleen": "Apply spleen",
       "skilltranscendence": "Self Transcendence",
       "confrontation": "Confrontation",
+      "confrontresult": "Confrontation Result",
       "rollnormal": "Normal (4d6)",
       "rollspleen": "With Spleen (5d6, worst 4 are kept)",
       "rollideal": "With Ideal (5d6, best 4 are kept)",
@@ -168,7 +177,19 @@
       "residence": "Residence",
       "origin": "Origin",
       "childhood": "Childhood",
-      "bonus": "Bonus"
+      "bonus": "Bonus",
+      "details": "Details",
+      "quantity": "Quantity",
+      "background": "Background",
+      "gmnotes": "GM Notes",
+      "age": "Age",
+      "profession": "Profession",
+      "level": "Level",
+      "create": "Create",
+      "delete": "Delete",
+      "edit": "Edit",
+      "spleen": "Spleen",
+      "ideal": "Ideal"
     }
   }
 }

lang/fr.json

@@ -19,7 +19,8 @@
       "cephaly": "Céphalie",
       "boheme": "Bohême",
       "amertume": "Amertume",
-      "gamelevel": "Niveau de jeu"
+      "gamelevel": "Niveau de jeu",
+      "gamelevelhelp": "Choisissez le niveau de jeu (Engrenages, Céphalie, Bohême, Amertume)"
     },
     "chat": {
       "formula": "Formule",
@@ -34,24 +35,27 @@
       "traitmalus": "Trait malus",
       "bonusmalustraits": "Bonus/Malus des Traits",
       "spectranscend": "Dépassement de soi : ",
-      "confrontselected": "Confrontation selectionnée",
+      "confrontselect": "Sélectionné pour la confrontation",
       "sentogm": "La confrontation a été envoyée au MJ"
     },
     "rule": {
-      "cephaly-success-12": "Durée : 1 scène - Impact : Superficiel - Bonus : 1 - Elegie : 1",
+      "cephaly-success-2": "Durée : 1 scène - Impact : Superficiel - Bonus : 1 - Elegie : 1",
       "cephaly-success-4": "Durée : 1 semaine - Impact : Léger - Bonus : 2 - Elegie : 2",
       "cephaly-success-6": "Durée : 1 mois - Impact : Grave - Bonus : 3 - Elegie : 3",
       "cephaly-success-8": "Durée : 1 année - Impact : Majeur - Bonus : 4 - Elegie : 4",
+      "cephaly-success-9": "Durée : Permanent - Impact : Majeur - Bonus : 4 - Elegie : 4",
       "cephaly-success-10": "Durée : Permanent - Impact : Mort - Bonus : 5 - Elegie : 5",
       "cephaly-failure-2": "Durée : 1 scène - Impact : Superficiel - Malus : 1 - Symptôme non visible et sans gravité - Altération bégigne difficilement repérable",
       "cephaly-failure-4": "Durée : 1 semaine - Impact : Léger - Malus : 2 - Symptôme visible non incapacitant - Altération repérable",
       "cephaly-failure-6": "Durée : 1 mois - Impact : Grave - Malus : 3 - Symptôme incapacitant - Altération repérable et fâcheuse",
       "cephaly-failure-8": "Durée : 1 année - Impact : Majeur - Malus : 4 - Symptôme très incapacitant - Altération dangereuse",
+      "cephaly-failure-9": "Durée : Permanent - Impact : Majeur - Malus : 4 - Symptôme très incapacitant - Altération dangereuse",
       "cephaly-failure-10": "Durée : Permanent - Impact : Mort/Folie - Malus : 5 - Symptôme spectaculaire et repoussant - Altération dangereuse globalement"
 
     },
     "warn": {
-      "notenoughdice": "L'Accomplissement et la Préservation doivent avoir 2 dés chacun"
+      "notenoughdice": "L'Accomplissement et la Préservation doivent avoir 2 dés chacun",
+      "confrontalready": "Confrontation déjà en cours avec ce jet"
     },
     "ui": {
       "equipmentfree": "Equipements (saisie libre)",
@@ -70,6 +74,10 @@
       "notes": "Notes",
       "bio": "Bio",
       "bionotes": "Bio&Notes",
+      "resetTranscendence": "Réinitialiser la transcendance",
+      "transcendenceCurrent": "Valeur actuelle",
+      "transcendenceMax": "Valeur max",
+      "toggleEditMax": "Modifier le niveau max",
       "skills": "Compétences",
       "traits": "Traits",
       "equipment": "Equipement",
@@ -113,6 +121,7 @@
       "applyspleen": "Utiliser le spleen",
       "skilltranscendence": "Dépassement de soi",
       "confrontation": "Confrontation",
+      "confrontresult": "Résultat de Confrontation",
       "rollnormal": "Normal (4d6)",
       "rollspleen": "Avec le Spleen (5d6, 4 plus bas conservés)",
       "rollideal": "Avec l'Idéal (5d6, 4 plus haut conservés)",
@@ -169,7 +178,19 @@
       "residence": "Résidence",
       "origin": "Origine",
       "childhood": "Enfance",
-      "bonus": "Bonus"
+      "bonus": "Bonus",
+      "details": "Détails",
+      "quantity": "Quantité",
+      "background": "Background",
+      "gmnotes": "Notes GM",
+      "age": "Âge",
+      "profession": "Profession",
+      "level": "Niveau",
+      "create": "Créer",
+      "delete": "Supprimer",
+      "edit": "Éditer",
+      "spleen": "Spleen",
+      "ideal": "Idéal"
     }
   }
 }

modules/actors/ecryme-actor-sheet.js

@@ -6,20 +6,21 @@
 import { EcrymeUtility } from "../common/ecryme-utility.js";
 
 /* -------------------------------------------- */
-export class EcrymeActorSheet extends ActorSheet {
+export class EcrymeActorSheet extends foundry.appv1.sheets.ActorSheet {
 
   /** @override */
   static get defaultOptions() {
 
-    return foundry.utils.mergeObject(super.defaultOptions, {
+    return {
+      ...super.defaultOptions,
       classes: ["fvtt-ecryme", "sheet", "actor"],
       template: "systems/fvtt-ecryme/templates/actors/actor-sheet.hbs",
       width: 860,
       height:680,
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "skills" }],
       dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
-      editScore: true
-    });
+      editScore: false
+    };
   }
 
   /* -------------------------------------------- */
@@ -33,7 +34,7 @@ export class EcrymeActorSheet extends ActorSheet {
       name: this.actor.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      system: foundry.utils.duplicate(this.object.system),
+      system: foundry.utils.deepClone(this.object.system),
       limited: this.object.limited,
       skills: this.actor.prepareSkills(),
       traits: this.actor.getRollTraits(),
@@ -41,21 +42,21 @@ export class EcrymeActorSheet extends ActorSheet {
       ideal: this.actor.getIdeal(),
       spleen: this.actor.getSpleen(),
       impacts: this.object.getImpacts(),
-      config: foundry.utils.duplicate(game.system.ecryme.config),
+      config: foundry.utils.deepClone(game.ecryme.config),
       weapons: this.actor.getWeapons(),
       maneuvers: this.actor.getManeuvers(),
       impactsMalus: this.actor.getImpactsMalus(),
-      archetype: foundry.utils.duplicate(this.actor.getArchetype()),
+      archetype: foundry.utils.deepClone(this.actor.getArchetype()),
       equipments: this.actor.getEquipments(),
       hasCephaly: EcrymeUtility.hasCephaly(),
       hasBoheme: EcrymeUtility.hasBoheme(),
       hasAmertume: EcrymeUtility.hasAmertume(),
       cephalySkills: this.actor.getCephalySkills(),
-      subActors: foundry.utils.duplicate(this.actor.getSubActors()),
+      subActors: foundry.utils.deepClone(this.actor.getSubActors()),
       annency: this.actor.getAnnency(),
-      description: await TextEditor.enrichHTML(this.object.system.biodata.description, { async: true }),
-      notes: await TextEditor.enrichHTML(this.object.system.biodata.notes, { async: true }),
-      equipementlibre: await TextEditor.enrichHTML(this.object.system.equipmentfree, { async: true }),
+      description: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.description, { async: true }),
+      notes: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.notes, { async: true }),
+      equipementlibre: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.equipmentfree, { async: true }),
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,
@@ -63,7 +64,7 @@ export class EcrymeActorSheet extends ActorSheet {
     }
     this.formData = formData;
 
-    console.log("PC : ", formData, this.object);
+    //console.log("PC : ", formData, this.object);
     return formData;
   }
 
@@ -162,7 +163,7 @@ export class EcrymeActorSheet extends ActorSheet {
 
     html.find('.roll-weapon').click((event) => {
       const armeId = $(event.currentTarget).data("arme-id")
-      this.actor.rollArme(armeId)
+      this.actor.rollWeapon(armeId)
     });
 
     html.find('.lock-unlock-sheet').click((event) => {
@@ -179,6 +180,10 @@ export class EcrymeActorSheet extends ActorSheet {
       let value = Number(ev.currentTarget.value);
       this.actor.update( { [`${fieldName}`]: value } );
     });
+    html.find('.reset-transcendence').click(async (ev) => {
+      await this.actor.resetSkillPool();
+      this.render(true);
+    });
   }
 
   /* -------------------------------------------- */

modules/actors/ecryme-actor.js

@@ -29,9 +29,9 @@ export class EcrymeActor extends Actor {
     if (data instanceof Array) {
       return super.create(data, options);
     }
-    // If the created actor has items (only applicable to foundry.utils.duplicated actors) bypass the new actor creation logic
+    // If the created actor has items bypass the new actor creation logic
     if (data.items) {
-      let actor = super.create(data, options);
+      let actor = await super.create(data, options);
       return actor;
     }
 
@@ -49,9 +49,9 @@ export class EcrymeActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  _preUpdate(changed, options, user) {
+  async _preUpdate(changed, options, user) {
 
-    super._preUpdate(changed, options, user);
+    await super._preUpdate(changed, options, user);
   }
 
   /* -------------------------------------------- */
@@ -73,7 +73,7 @@ export class EcrymeActor extends Actor {
     return comp;
   }
   getArchetype() {
-    let comp = foundry.utils.duplicate(this.items.find(item => item.type == 'archetype') || { name: "Pas d'archetype" })
+    let comp = foundry.utils.deepClone(this.items.find(item => item.type == 'archetype') || { name: "Pas d'archetype" })
     if (comp?.system) {
       comp.tarot = EcrymeUtility.getTarot(comp.system.lametutelaire)
     }
@@ -92,7 +92,7 @@ export class EcrymeActor extends Actor {
   }
   /* -----------------------  --------------------- */
   addAnnencyActor(actorId) {
-    let members = foundry.utils.duplicate(this.system.base.characters)
+    let members = foundry.utils.deepClone(this.system.base.characters)
     members.push(actorId)
     this.update({ 'system.base.characters': members })
   }
@@ -123,7 +123,7 @@ export class EcrymeActor extends Actor {
   /* -------------------------------------------- */
   getTrait(id) {
     //console.log("TRAITS", this.items, this.items.filter(it => it.type == "trait") )
-    return this.items.find(it => it.type == "trait" && it._id == id)
+    return this.items.find(it => it.type == "trait" && it.id === id)
   }
   /* -------------------------------------------- */
   getSpecialization(id) {
@@ -136,7 +136,7 @@ export class EcrymeActor extends Actor {
   }
   /* -------------------------------------------- */
   prepareSkills() {
-    let skills = foundry.utils.duplicate(this.system.skills)
+    let skills = foundry.utils.deepClone(this.system.skills)
     for (let categKey in skills) {
       let category = skills[categKey]
       for (let skillKey in category.skilllist) {
@@ -148,22 +148,22 @@ export class EcrymeActor extends Actor {
   }
   /* -------------------------------------------- */
   getCephalySkills() {
-    let skills = foundry.utils.duplicate(this.system.cephaly.skilllist)
+    let skills = foundry.utils.deepClone(this.system.cephaly.skilllist)
     return skills
   }
   /* -------------------------------------------- */
   getImpacts() {
-    let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'impact') || [])
+    let comp = foundry.utils.deepClone(this.items.filter(item => item.type == 'impact') || [])
     return comp;
   }
   /* -------------------------------------------- */
   getWeapons() {
-    let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'weapon') || [])
+    let comp = foundry.utils.deepClone(this.items.filter(item => item.type == 'weapon') || [])
     EcrymeUtility.sortArrayObjectsByName(comp)
     return comp;
   }
   getManeuvers() {
-    let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'maneuver') || [])
+    let comp = foundry.utils.deepClone(this.items.filter(item => item.type == 'maneuver') || [])
     EcrymeUtility.sortArrayObjectsByName(comp)
     return comp;
   }
@@ -171,7 +171,7 @@ export class EcrymeActor extends Actor {
   getItemById(id) {
     let item = this.items.find(item => item.id == id);
     if (item) {
-      item = foundry.utils.duplicate(item)
+      item = foundry.utils.deepClone(item)
     }
     return item;
   }
@@ -206,13 +206,13 @@ export class EcrymeActor extends Actor {
 
   /* ------------------------------------------- */
   async buildContainerTree() {
-    let equipments = foundry.utils.duplicate(this.items.filter(item => item.type == "equipment") || [])
+    let equipments = foundry.utils.deepClone(this.items.filter(item => item.type == "equipment") || [])
     for (let equip1 of equipments) {
       if (equip1.system.iscontainer) {
         equip1.system.contents = []
         equip1.system.contentsEnc = 0
         for (let equip2 of equipments) {
-          if (equip1._id != equip2.id && equip2.system.containerid == equip1.id) {
+          if (equip1.id !== equip2.id && equip2.system.containerid == equip1.id) {
             equip1.system.contents.push(equip2)
             let q = equip2.system.quantity ?? 1
             equip1.system.contentsEnc += q * equip2.system.weight
@@ -288,7 +288,7 @@ export class EcrymeActor extends Actor {
 
   /* -------------------------------------------- */
   clearInitiative() {
-    this.getFlag("world", "initiative", -1)
+    this.setFlag("world", "initiative", -1)
   }
   /* -------------------------------------------- */
   getInitiativeScore(combatId, combatantId) {
@@ -301,13 +301,13 @@ export class EcrymeActor extends Actor {
   getSubActors() {
     let subActors = [];
     for (let id of this.system.subactors) {
-      subActors.push(foundry.utils.duplicate(game.actors.get(id)))
+      subActors.push(foundry.utils.deepClone(game.actors.get(id)))
     }
     return subActors;
   }
   /* -------------------------------------------- */
   async addSubActor(subActorId) {
-    let subActors = foundry.utils.duplicate(this.system.subactors);
+    let subActors = foundry.utils.deepClone(this.system.subactors);
     subActors.push(subActorId);
     await this.update({ 'system.subactors': subActors });
   }
@@ -378,10 +378,10 @@ export class EcrymeActor extends Actor {
     rollData.actorId = this.id
     rollData.img = this.img
     rollData.isReroll = false
-    rollData.config = game.system.ecryme.config
-    rollData.traits = foundry.utils.duplicate(this.getRollTraits())
-    rollData.spleen = foundry.utils.duplicate(this.getSpleen() || {})
-    rollData.ideal = foundry.utils.duplicate(this.getIdeal() || {})
+    rollData.config = game.ecryme.config
+    rollData.traits = this.getRollTraits().map(t => ({ id: t.id, name: t.name, img: t.img, system: { level: t.system.level, traitype: t.system.traitype } }))
+    rollData.spleen = this.getSpleen() ? foundry.utils.deepClone(this.getSpleen()) : null
+    rollData.ideal  = this.getIdeal()  ? foundry.utils.deepClone(this.getIdeal())  : null
     rollData.confrontBonus = this.getBonusList()
 
     return rollData
@@ -402,7 +402,7 @@ export class EcrymeActor extends Actor {
       }
     } else {
       skill = this.system.skills[categKey].skilllist[skillKey]
-      skill = foundry.utils.duplicate(skill)
+      skill = foundry.utils.deepClone(skill)
       skill.spec = this.getSpecializations(skillKey)  
     }
     
@@ -434,7 +434,7 @@ export class EcrymeActor extends Actor {
     let spec = this.items.find(it => it.type == "specialization" && it.id == specId)
     rollData.mode = "skill"
     rollData.selectedSpecs = [spec.id]
-    rollData.forcedSpec = foundry.utils.duplicate(spec)
+    rollData.forcedSpec = foundry.utils.deepClone(spec)
     rollData.title = game.i18n.localize(rollData.skill.name)
     this.startRoll(rollData).catch("Error on startRoll")
   }
@@ -444,11 +444,11 @@ export class EcrymeActor extends Actor {
     let rollData = this.getCommonSkill(categKey, skillKey)
     rollData.mode = "skill"
     rollData.title = game.i18n.localize("ECRY.ui.confrontation") + " : " + game.i18n.localize(rollData.skill.name)
-    rollData.executionTotal    = rollData.skill.value
-    rollData.preservationTotal = rollData.skill.value
+    rollData.executionTotal    = rollData.skill.max
+    rollData.preservationTotal = rollData.skill.max
     rollData.applyTranscendence = "execution"
-    rollData.traitsBonus = foundry.utils.duplicate(rollData.traits)
-    rollData.traitsMalus = foundry.utils.duplicate(rollData.traits)
+    rollData.traitsBonus = foundry.utils.deepClone(rollData.traits)
+    rollData.traitsMalus = foundry.utils.deepClone(rollData.traits)
     console.log("ROLLDATA", rollData)
     let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData)
     confrontStartDialog.render(true)
@@ -457,16 +457,16 @@ export class EcrymeActor extends Actor {
   async rollCephalySkillConfront(skillKey) {
     let rollData = this.getCommonRollData()
     rollData.mode = "cephaly"
-    rollData.skill = foundry.utils.duplicate(this.system.cephaly.skilllist[skillKey])
-    rollData.annency = foundry.utils.duplicate(this.getAnnency())
+    rollData.skill = foundry.utils.deepClone(this.system.cephaly.skilllist[skillKey])
+    rollData.annency = foundry.utils.deepClone(this.getAnnency())
     rollData.img = rollData.skill.img
     rollData.skill.categKey = "cephaly"
     rollData.skill.skillKey = skillKey
     rollData.title = game.i18n.localize("ECRY.ui.cephaly") + " : " + game.i18n.localize(rollData.skill.name)
-    rollData.executionTotal    = rollData.skill.value
-    rollData.preservationTotal = rollData.skill.value
-    rollData.traitsBonus = foundry.utils.duplicate(rollData.traits)
-    rollData.traitsMalus = foundry.utils.duplicate(rollData.traits)
+    rollData.executionTotal    = rollData.skill.max
+    rollData.preservationTotal = rollData.skill.max
+    rollData.traitsBonus = foundry.utils.deepClone(rollData.traits)
+    rollData.traitsMalus = foundry.utils.deepClone(rollData.traits)
     rollData.applyTranscendence = "execution"
     let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData)
     confrontStartDialog.render(true)
@@ -482,12 +482,12 @@ export class EcrymeActor extends Actor {
       rollData = this.getCommonSkill("physical", "shooting")
     }
     rollData.mode = "weapon"
-    rollData.weapon = foundry.utils.duplicate(weapon)
+    rollData.weapon = foundry.utils.deepClone(weapon)
     rollData.title = game.i18n.localize("ECRY.ui.confrontation") + " : " + game.i18n.localize(rollData.skill.name)
-    rollData.executionTotal    = rollData.skill.value
-    rollData.preservationTotal = rollData.skill.value
-    rollData.traitsBonus = foundry.utils.duplicate(rollData.traits)
-    rollData.traitsMalus = foundry.utils.duplicate(rollData.traits)
+    rollData.executionTotal    = rollData.skill.max
+    rollData.preservationTotal = rollData.skill.max
+    rollData.traitsBonus = foundry.utils.deepClone(rollData.traits)
+    rollData.traitsMalus = foundry.utils.deepClone(rollData.traits)
     rollData.applyTranscendence = "execution"
     let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData)
     confrontStartDialog.render(true)
@@ -497,12 +497,12 @@ export class EcrymeActor extends Actor {
   rollWeapon(weaponId) {
     let weapon = this.items.get(weaponId)
     if (weapon) {
-      weapon = foundry.utils.duplicate(weapon)
+      weapon = foundry.utils.deepClone(weapon)
       let rollData = this.getCommonRollData()
       if (weapon.system.armetype == "mainsnues" || weapon.system.armetype == "epee") {
         rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor((this.getPhysiqueMalus() + this.system.attributs.physique.value + this.system.attributs.habilite.value) / 2) }
       } else {
-        rollData.attr = foundry.utils.duplicate(this.system.attributs.habilite)
+        rollData.attr = foundry.utils.deepClone(this.system.attributs.habilite)
       }
       rollData.mode = "weapon"
       rollData.weapon = weapon
@@ -514,6 +514,32 @@ export class EcrymeActor extends Actor {
     }
   }
 
+  /* -------------------------------------------- */
+  resetSkillPool() {
+    const updateData = {}
+    const skills = this.system.skills
+    for (const categKey of Object.keys(skills)) {
+      const skilllist = skills[categKey]?.skilllist
+      if (!skilllist) continue
+      for (const skillKey of Object.keys(skilllist)) {
+        const skill = skilllist[skillKey]
+        if (skill.max !== undefined) {
+          updateData[`system.skills.${categKey}.skilllist.${skillKey}.value`] = skill.max
+        }
+      }
+    }
+    const cephaly = this.system.cephaly?.skilllist
+    if (cephaly) {
+      for (const skillKey of Object.keys(cephaly)) {
+        const skill = cephaly[skillKey]
+        if (skill.max !== undefined) {
+          updateData[`system.cephaly.skilllist.${skillKey}.value`] = skill.max
+        }
+      }
+    }
+    return this.update(updateData)
+  }
+
   /* -------------------------------------------- */
   async startRoll(rollData) {
     let rollDialog = await EcrymeRollDialog.create(this, rollData)

modules/actors/ecryme-annency-sheet.js

@@ -6,12 +6,13 @@
 import { EcrymeUtility } from "../common/ecryme-utility.js";
 
 /* -------------------------------------------- */
-export class EcrymeAnnencySheet extends ActorSheet {
+export class EcrymeAnnencySheet extends foundry.appv1.sheets.ActorSheet {
 
   /** @override */
   static get defaultOptions() {
 
-    return foundry.utils.mergeObject(super.defaultOptions, {
+    return {
+      ...super.defaultOptions,
       classes: ["fvtt-ecryme", "sheet", "actor"],
       template: "systems/fvtt-ecryme/templates/actors/annency-sheet.hbs",
       width: 640,
@@ -19,7 +20,7 @@ export class EcrymeAnnencySheet extends ActorSheet {
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "annency" }],
       dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
       editScore: true
-    });
+    };
   }
 
   /* -------------------------------------------- */
@@ -33,9 +34,9 @@ export class EcrymeAnnencySheet extends ActorSheet {
       name: this.actor.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      system: foundry.utils.duplicate(this.object.system),
+      system: foundry.utils.deepClone(this.object.system),
       limited: this.object.limited,
-      config: foundry.utils.duplicate(game.system.ecryme.config),
+      config: foundry.utils.deepClone(game.ecryme.config),
       hasCephaly: EcrymeUtility.hasCephaly(),
       hasBoheme: EcrymeUtility.hasBoheme(),
       hasAmertume: EcrymeUtility.hasAmertume(),
@@ -121,7 +122,7 @@ export class EcrymeAnnencySheet extends ActorSheet {
     } else {
       ui.notifications.warn("Actor not found")
     }
-    super._onDropActor(event)
+    super._onDropActor(event, dragData)
   }
 
   /* -------------------------------------------- */

modules/actors/sheets/_module.js

@@ -0,0 +1,2 @@
+export { default as EcrymeActorSheet } from "./pc-npc-sheet.js"
+export { default as EcrymeAnnencySheet } from "./annency-sheet.js"

modules/actors/sheets/annency-sheet.js

@@ -0,0 +1,127 @@
+import EcrymeBaseActorSheet from "./base-actor-sheet.js"
+import { EcrymeUtility } from "../../common/ecryme-utility.js"
+
+/**
+ * Actor sheet for the Annency type using Application V2.
+ */
+export default class EcrymeAnnencySheet extends EcrymeBaseActorSheet {
+
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["annency"],
+    position: { width: 640, height: 600 },
+    actions: {
+      actorEdit:   EcrymeAnnencySheet.#onActorEdit,
+      actorDelete: EcrymeAnnencySheet.#onActorDelete,
+      itemEdit:    EcrymeAnnencySheet.#onItemEdit,
+      itemDelete:  EcrymeAnnencySheet.#onItemDelete,
+      itemCreate:  EcrymeAnnencySheet.#onItemCreate,
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    header:  { template: "systems/fvtt-ecryme/templates/actors/partials/actor-header.hbs" },
+    tabs:    { template: "templates/generic/tab-navigation.hbs" },
+    annency: { template: "systems/fvtt-ecryme/templates/actors/annency-annency.hbs" },
+    boheme:  { template: "systems/fvtt-ecryme/templates/actors/annency-boheme.hbs" },
+  }
+
+  /** @override */
+  tabGroups = { primary: "annency" }
+
+  /** Build tabs conditionally based on active modules */
+  _getTabs() {
+    const tabs = {}
+    if (EcrymeUtility.hasCephaly()) {
+      tabs.annency = { id: "annency", group: "primary", label: "ECRY.ui.annency" }
+    }
+    if (EcrymeUtility.hasBoheme()) {
+      tabs.boheme = { id: "boheme", group: "primary", label: "ECRY.ui.boheme" }
+    }
+    // Ensure initial tab is valid
+    if (!tabs[this.tabGroups.primary]) {
+      this.tabGroups.primary = Object.keys(tabs)[0] ?? "annency"
+    }
+    for (const tab of Object.values(tabs)) {
+      tab.active = this.tabGroups[tab.group] === tab.id
+      tab.cssClass = tab.active ? "active" : ""
+    }
+    return tabs
+  }
+
+  /** @override */
+  async _prepareContext() {
+    const actor = this.document
+    return {
+      actor,
+      system:       actor.system,
+      source:       actor.toObject(),
+      fields:       actor.schema.fields,
+      systemFields: actor.system.schema.fields,
+      type:         actor.type,
+      img:          actor.img,
+      name:         actor.name,
+      isEditable:   this.isEditable,
+      config:       game.ecryme.config,
+      hasCephaly:   EcrymeUtility.hasCephaly(),
+      hasBoheme:    EcrymeUtility.hasBoheme(),
+      characters:   actor.buildAnnencyActorList(),
+      owner:        this.document.isOwner,
+      isGM:         game.user.isGM,
+      tabs:         this._getTabs(),
+    }
+  }
+
+  /** @override */
+  async _preparePartContext(partId, context) {
+    context = await super._preparePartContext(partId, context)
+    if (partId === "annency" || partId === "boheme") {
+      context.tab = context.tabs[partId]
+    }
+    return context
+  }
+
+  /** @override */
+  async _onDrop(event) {
+    const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event)
+    if (data?.type === "Actor") {
+      const actor = await fromUuid(data.uuid)
+      if (actor) {
+        this.actor.addAnnencyActor(actor.id)
+      } else {
+        ui.notifications.warn("Actor not found")
+      }
+    }
+  }
+
+  // #region Static Action Handlers
+
+  static #onActorEdit(event, target) {
+    const li = target.closest("[data-actor-id]")
+    game.actors.get(li?.dataset.actorId)?.sheet.render(true)
+  }
+
+  static async #onActorDelete(event, target) {
+    const li = target.closest("[data-actor-id]")
+    this.actor.removeAnnencyActor(li?.dataset.actorId)
+  }
+
+  static #onItemEdit(event, target) {
+    const li = target.closest("[data-item-id]")
+    const itemId = li?.dataset.itemId ?? target.dataset.itemId
+    this.document.items.get(itemId)?.sheet.render(true)
+  }
+
+  static async #onItemDelete(event, target) {
+    const li = target.closest("[data-item-id]")
+    EcrymeUtility.confirmDelete(this, $(li)).catch(() => {})
+  }
+
+  static async #onItemCreate(event, target) {
+    const dataType = target.dataset.type
+    await this.document.createEmbeddedDocuments("Item", [{ name: "NewItem", type: dataType }], { renderSheet: true })
+  }
+
+  // #endregion
+}

modules/actors/sheets/base-actor-sheet.js

@@ -0,0 +1,53 @@
+const { HandlebarsApplicationMixin } = foundry.applications.api
+
+/**
+ * Base actor sheet for Ecryme using Application V2.
+ * Provides common drag-drop, image editing, and shared structure.
+ */
+export default class EcrymeBaseActorSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ActorSheetV2) {
+
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["fvtt-ecryme", "sheet", "actor"],
+    position: {
+      width: 860,
+      height: 680,
+    },
+    form: {
+      submitOnChange: true,
+    },
+    window: {
+      resizable: true,
+    },
+    dragDrop: [{ dragSelector: ".item-list .item[data-item-id]", dropSelector: null }],
+    actions: {
+      editImage: EcrymeBaseActorSheet.#onEditImage,
+    },
+  }
+
+  _canDragStart(selector) { return this.isEditable }
+  _canDragDrop(selector) { return this.isEditable && this.document.isOwner }
+  _onDragStart(event) {}
+  _onDragOver(event) {}
+  async _onDrop(event) {}
+  // #endregion
+
+  // #region Actions
+  static async #onEditImage(event, target) {
+    const attr = target.dataset.edit
+    const current = foundry.utils.getProperty(this.document, attr)
+    const { img } = this.document.constructor.getDefaultArtwork?.(this.document.toObject()) ?? {}
+    const fp = new FilePicker({
+      current,
+      type: "image",
+      redirectToRoot: img ? [img] : [],
+      callback: (path) => {
+        this.document.update({ [attr]: path })
+      },
+      top: this.position.top + 40,
+      left: this.position.left + 10,
+    })
+    return fp.browse()
+  }
+  // #endregion
+}

modules/actors/sheets/pc-npc-sheet.js

@@ -0,0 +1,263 @@
+import EcrymeBaseActorSheet from "./base-actor-sheet.js"
+import { EcrymeUtility } from "../../common/ecryme-utility.js"
+
+/**
+ * Actor sheet for PC and NPC types using Application V2.
+ */
+export default class EcrymeActorSheet extends EcrymeBaseActorSheet {
+
+  #editScore = false
+
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["pc-npc"],
+    position: { width: 860, height: 680 },
+    actions: {
+      openAnnency:       EcrymeActorSheet.#onOpenAnnency,
+      itemEdit:          EcrymeActorSheet.#onItemEdit,
+      itemDelete:        EcrymeActorSheet.#onItemDelete,
+      itemCreate:        EcrymeActorSheet.#onItemCreate,
+      subactorEdit:      EcrymeActorSheet.#onSubactorEdit,
+      subactorDelete:    EcrymeActorSheet.#onSubactorDelete,
+      rollSkill:         EcrymeActorSheet.#onRollSkill,
+      rollSpec:          EcrymeActorSheet.#onRollSpec,
+      rollSkillConfront: EcrymeActorSheet.#onRollSkillConfront,
+      rollCephaly:       EcrymeActorSheet.#onRollCephaly,
+      rollWeaponConfront:EcrymeActorSheet.#onRollWeaponConfront,
+      impactModify:      EcrymeActorSheet.#onImpactModify,
+      rollWeapon:        EcrymeActorSheet.#onRollWeapon,
+      lockUnlock:        EcrymeActorSheet.#onLockUnlock,
+      equipItem:         EcrymeActorSheet.#onEquipItem,
+      quantityMinus:     EcrymeActorSheet.#onQuantityMinus,
+      quantityPlus:      EcrymeActorSheet.#onQuantityPlus,
+      resetTranscendence:EcrymeActorSheet.#onResetTranscendence,
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    header:     { template: "systems/fvtt-ecryme/templates/actors/partials/actor-header.hbs" },
+    tabs:       { template: "templates/generic/tab-navigation.hbs" },
+    skills:     { template: "systems/fvtt-ecryme/templates/actors/actor-skills.hbs" },
+    traits:     { template: "systems/fvtt-ecryme/templates/actors/actor-traits.hbs" },
+    combat:     { template: "systems/fvtt-ecryme/templates/actors/actor-combat.hbs" },
+    cephaly:    { template: "systems/fvtt-ecryme/templates/actors/actor-cephaly.hbs" },
+    equipements:{ template: "systems/fvtt-ecryme/templates/actors/actor-equipements.hbs" },
+    biodata:    { template: "systems/fvtt-ecryme/templates/actors/actor-biodata.hbs" },
+  }
+
+  /** @override */
+  tabGroups = { primary: "skills" }
+
+  /** Build tabs, conditionally adding cephaly if the module is active */
+  _getTabs() {
+    const hasCephaly = EcrymeUtility.hasCephaly()
+    const tabs = {
+      skills:     { id: "skills",      group: "primary", label: "ECRY.ui.skills" },
+      traits:     { id: "traits",      group: "primary", label: "ECRY.ui.traits" },
+      combat:     { id: "combat",      group: "primary", label: "ECRY.ui.healthcombat" },
+      equipements:{ id: "equipements", group: "primary", label: "ECRY.ui.equipment" },
+      biodata:    { id: "biodata",     group: "primary", label: "ECRY.ui.bionotes" },
+    }
+    if (hasCephaly) {
+      // Insert cephaly after combat, rebuilding the object to preserve insertion order
+      const ordered = {}
+      for (const [k, v] of Object.entries(tabs)) {
+        ordered[k] = v
+        if (k === "combat") ordered.cephaly = { id: "cephaly", group: "primary", label: "ECRY.ui.cephaly" }
+      }
+      for (const tab of Object.values(ordered)) {
+        tab.active = this.tabGroups[tab.group] === tab.id
+        tab.cssClass = tab.active ? "active" : ""
+      }
+      return ordered
+    }
+    for (const tab of Object.values(tabs)) {
+      tab.active = this.tabGroups[tab.group] === tab.id
+      tab.cssClass = tab.active ? "active" : ""
+    }
+    return tabs
+  }
+
+  /** @override */
+  async _prepareContext() {
+    const actor = this.document
+    return {
+      actor,
+      system:       actor.system,
+      source:       actor.toObject(),
+      fields:       actor.schema.fields,
+      systemFields: actor.system.schema.fields,
+      type:         actor.type,
+      img:          actor.img,
+      name:         actor.name,
+      isEditable:   this.isEditable,
+      config:       game.ecryme.config,
+      hasCephaly:   EcrymeUtility.hasCephaly(),
+      hasBoheme:    EcrymeUtility.hasBoheme(),
+      hasAmertume:  EcrymeUtility.hasAmertume(),
+      skills:       actor.prepareSkills(),
+      traits:       actor.getRollTraits(),
+      ideal:        actor.getIdeal(),
+      spleen:       actor.getSpleen(),
+      weapons:      actor.getWeapons(),
+      maneuvers:    actor.getManeuvers(),
+      impactsMalus: actor.getImpactsMalus(),
+      equipments:   actor.getEquipments(),
+      cephalySkills:actor.getCephalySkills(),
+      confrontations: actor.getConfrontations(),
+      subActors:    actor.getSubActors(),
+      annency:      actor.getAnnency(),
+      owner:        this.document.isOwner,
+      isGM:         game.user.isGM,
+      editScore:    this.#editScore,
+      tabs:         this._getTabs(),
+    }
+  }
+
+  /** @override */
+  async _preparePartContext(partId, context) {
+    context = await super._preparePartContext(partId, context)
+    switch (partId) {
+      case "skills":
+      case "traits":
+      case "combat":
+      case "cephaly":
+      case "equipements":
+        context.tab = context.tabs[partId] ?? { cssClass: "" }
+        break
+      case "biodata":
+        context.tab = context.tabs.biodata
+        context.enrichedDescription = await foundry.applications.ux.TextEditor.implementation.enrichHTML(
+          this.document.system.biodata.description, { async: true }
+        )
+        context.enrichedGmnotes = await foundry.applications.ux.TextEditor.implementation.enrichHTML(
+          this.document.system.biodata.gmnotes, { async: true }
+        )
+        break
+    }
+    return context
+  }
+
+  // #region Drag and Drop
+
+  /** Handle incoming drops: Items from sidebar/compendium, Actors as subactors */
+  async _onDrop(event) {
+    const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event)
+    if (!data?.type) return
+
+    if (data.type === "Item") {
+      const item = await fromUuid(data.uuid)
+      if (!item) return
+      await this.document.createEmbeddedDocuments("Item", [item.toObject()])
+    } else if (data.type === "Actor") {
+      const actor = fromUuidSync(data.uuid)
+      if (actor) await this.actor.addSubActor(actor.id)
+    }
+  }
+
+  /** Handle outgoing drag from embedded item rows */
+  _onDragStart(event) {
+    const li = event.currentTarget.closest("[data-item-id]")
+    if (!li) return
+    const item = this.document.items.get(li.dataset.itemId)
+    if (!item) return
+    event.dataTransfer.setData("text/plain", JSON.stringify(item.toDragData()))
+  }
+
+  // #endregion
+
+  // #region Static Action Handlers
+
+  static #onOpenAnnency(event, target) {
+    const actorId = target.dataset.annencyId
+    game.actors.get(actorId)?.sheet.render(true)
+  }
+
+  static #onItemEdit(event, target) {
+    const li = target.closest("[data-item-id]")
+    const itemId = li?.dataset.itemId ?? target.dataset.itemId
+    this.document.items.get(itemId)?.sheet.render(true)
+  }
+
+  static async #onItemDelete(event, target) {
+    const li = target.closest("[data-item-id]")
+    EcrymeUtility.confirmDelete(this, $(li)).catch(() => {})
+  }
+
+  static async #onItemCreate(event, target) {
+    const dataType = target.dataset.type
+    await this.document.createEmbeddedDocuments("Item", [{ name: "NewItem", type: dataType }], { renderSheet: true })
+  }
+
+  static #onSubactorEdit(event, target) {
+    const li = target.closest("[data-actor-id]")
+    game.actors.get(li?.dataset.actorId)?.sheet.render(true)
+  }
+
+  static #onSubactorDelete(event, target) {
+    const li = target.closest("[data-actor-id]")
+    this.actor.delSubActor(li?.dataset.actorId)
+  }
+
+  static #onRollSkill(event, target) {
+    this.actor.rollSkill(target.dataset.categoryKey, target.dataset.skillKey)
+  }
+
+  static #onRollSpec(event, target) {
+    this.actor.rollSpec(target.dataset.categoryKey, target.dataset.skillKey, target.dataset.specId)
+  }
+
+  static #onRollSkillConfront(event, target) {
+    this.actor.rollSkillConfront(target.dataset.categoryKey, target.dataset.skillKey)
+  }
+
+  static #onRollCephaly(event, target) {
+    this.actor.rollCephalySkillConfront(target.dataset.skillKey)
+  }
+
+  static #onRollWeaponConfront(event, target) {
+    const li = target.closest("[data-item-id]")
+    this.actor.rollWeaponConfront(li?.dataset.itemId)
+  }
+
+  static #onImpactModify(event, target) {
+    this.actor.modifyImpact(
+      target.dataset.impactType,
+      target.dataset.impactLevel,
+      Number(target.dataset.impactModifier)
+    )
+  }
+
+  static #onRollWeapon(event, target) {
+    this.actor.rollWeapon(target.dataset.armeId)
+  }
+
+  static #onLockUnlock(event, target) {
+    this.#editScore = !this.#editScore
+    this.render(true)
+  }
+
+  static #onEquipItem(event, target) {
+    const li = target.closest("[data-item-id]")
+    this.actor.equipItem(li?.dataset.itemId)
+    this.render(true)
+  }
+
+  static #onQuantityMinus(event, target) {
+    const li = target.closest("[data-item-id]")
+    this.actor.incDecQuantity(li?.dataset.itemId, -1)
+  }
+
+  static #onQuantityPlus(event, target) {
+    const li = target.closest("[data-item-id]")
+    this.actor.incDecQuantity(li?.dataset.itemId, +1)
+  }
+
+  static async #onResetTranscendence(event, target) {
+    await this.actor.resetSkillPool()
+    this.render(true)
+  }
+
+  // #endregion
+}

modules/app/ecryme-combat.js

@@ -8,7 +8,7 @@ export class EcrymeCombat extends Combat {
     ids = typeof ids === "string" ? [ids] : ids;
     for (let cId = 0; cId < ids.length; cId++) {
       const c = this.combatants.get(ids[cId]);
-      let id = c._id || c.id;
+      let id = c.id;
       let initBonus = c.actor ? c.actor.getInitiativeScore( this.id, id ) : -1;
       await this.updateEmbeddedDocuments("Combatant", [ { _id: id, initiative: initBonus } ]);
     }
@@ -17,9 +17,6 @@ export class EcrymeCombat extends Combat {
   }
 
   /* -------------------------------------------- */
-  _onUpdate(changed, options, userId) {
-  }
-
   /* -------------------------------------------- */
   static async checkTurnPosition() {
     while (game.combat.turn > 0) {
@@ -28,13 +25,13 @@ export class EcrymeCombat extends Combat {
   }
 
   /* -------------------------------------------- */
-  _onDelete() {
+  async _onDelete() {
     let combatants = this.combatants.contents
     for (let c of combatants) {
       let actor = game.actors.get(c.actorId)
-      actor.clearInitiative()
+      await actor.clearInitiative()
     }
-    super._onDelete()
+    await super._onDelete()
   }
 
 }

modules/app/ecryme-commands.js

@@ -7,10 +7,10 @@ import { EcrymeCharacterSummary } from "../app/ecryme-summary-app.js"
 export class EcrymeCommands {
 
   static init() {
-    if (!game.system.ecryme.commands) {
+    if (!game.ecryme.commands) {
       const commands = new EcrymeCommands();
       commands.registerCommand({ path: ["/resume"], func: (content, msg, params) => EcrymeCharacterSummary.displayPCSummary(), descr: "Affiche la liste des PJs!" });
-      game.system.ecryme.commands = commands;
+      game.ecryme.commands = commands;
     }
   }
   constructor() {
@@ -88,7 +88,7 @@ export class EcrymeCommands {
     if (command && command.func) {
       const result = command.func(content, msg, params);
       if (result == false) {
-        CrucibleCommands._chatAnswer(msg, command.descr);
+        EcrymeCommands._chatAnswer(msg, command.descr);
       }
       return true;
     }

modules/app/ecryme-hotbar.js

@@ -14,7 +14,7 @@ export class EcrymeHotbar {
     if (documentData.type == "Item") {
       console.log("Drop done !!!", bar, documentData, slot)
       let item = documentData.data
-      let command = `game.system.ecryme.EcrymeHotbar.rollMacro("${item.name}", "${item.type}");`
+      let command = `game.ecryme.EcrymeHotbar.rollMacro("${item.name}", "${item.type}");`
       let macro = game.macros.contents.find(m => (m.name === item.name) && (m.command === command))
       if (!macro) {
         macro = await Macro.create({
@@ -33,9 +33,9 @@ export class EcrymeHotbar {
       let macro = game.macros.contents.find(m => (m.name === actor.name) && (m.command === command));
       if (!macro) {
         macro = await Macro.create({
-          name: actor.data.name,
+          name: actor.name,
           type: "script",
-          img: actor.data.img,
+          img: actor.img,
           command: command
         }, { displaySheet: false })
         game.user.assignHotbarMacro(macro, slot);
@@ -48,7 +48,7 @@ export class EcrymeHotbar {
       let macro = game.macros.contents.find(m => (m.name === journal.name) && (m.command === command));
       if (!macro) {
         macro = await Macro.create({
-          name: journal.data.name,
+          name: journal.name,
           type: "script",
           img: "",
           command: command

modules/app/ecryme-summary-app.js

@@ -1,13 +1,37 @@
 /* -------------------------------------------- */
-import { EcrymeUtility } from "../common/ecryme-utility.js";
+const { HandlebarsApplicationMixin } = foundry.applications.api
 
 /* -------------------------------------------- */
-export class EcrymeCharacterSummary extends Application {
+export class EcrymeCharacterSummary extends HandlebarsApplicationMixin(foundry.applications.api.ApplicationV2) {
+
+  /* -------------------------------------------- */
+  static DEFAULT_OPTIONS = {
+    id: "ecryme-character-summary",
+    classes: ["fvtt-ecryme", "dialog"],
+    position: { width: 920 },
+    window: { title: "ECRY.ui.charactersummary", resizable: true },
+    actions: {
+      actorOpen:   EcrymeCharacterSummary.#onActorOpen,
+      summaryRoll: EcrymeCharacterSummary.#onSummaryRoll,
+      actorDelete: EcrymeCharacterSummary.#onActorDelete,
+    },
+  }
+
+  /* -------------------------------------------- */
+  static PARTS = {
+    content: { template: "systems/fvtt-ecryme/templates/dialogs/character-summary.hbs" },
+  }
+
+  /* -------------------------------------------- */
+  constructor(options = {}) {
+    super(options)
+    this.settings = game.settings.get("fvtt-ecryme", "character-summary-data")
+  }
 
   /* -------------------------------------------- */
   static displayPCSummary() {
     if (game.user.isGM) {
-      game.system.ecryme.charSummary.render(true)
+      game.ecryme.charSummary.render(true)
     } else {
       ui.notifications.info("Commande /summary réservée au MJ !")
     }
@@ -16,119 +40,95 @@ export class EcrymeCharacterSummary extends Application {
   /* -------------------------------------------- */
   updatePCSummary() {
     if (this.rendered) {
-      this.render(true)
+      this.render()
     }
   }
 
-  /* -------------------------------------------- */
-  static createSummaryPos() {
-    return { top: 200, left: 200 };
-  }
-
   /* -------------------------------------------- */
   static ready() {
-    if (!game.user.isGM) { // Uniquement si GM
+    if (!game.user.isGM) {
       return
     }
     let charSummary = new EcrymeCharacterSummary()
-    game.system.ecryme.charSummary = charSummary
+    game.ecryme.charSummary = charSummary
   }
 
   /* -------------------------------------------- */
-  constructor() {
-    super();
-    //game.settings.set("world", "character-summary-data", {npcList: [], x:0, y:0})
-    //this.settings = game.settings.get("world", "character-summary-data")
-  }
-
-  /* -------------------------------------------- */
-  static get defaultOptions() {
-    return foundry.utils.mergeObject(super.defaultOptions, {
-      template: "systems/fvtt-ecryme/templates/dialogs/character-summary.hbs",
-      popOut: true,
-      resizable: true,
-      dragDrop: [{ dragSelector: ".items-list .item", dropSelector: null }],
-      classes: ["bol", "dialog"], width: 920, height: 'fit-content'
-    })
-  }
-
-  /* -------------------------------------------- */
-  getData() {
-    let formData = super.getData();
-
-    formData.pcs = game.actors.filter(ac => ac.type == "personnage" && ac.hasPlayerOwner)
-    formData.npcs = []
+  async _prepareContext() {
+    let pcs = game.actors.filter(ac => ac.type == "pc" && ac.hasPlayerOwner)
+    let npcs = []
     let newList = []
     let toUpdate = false
     for (let actorId of this.settings.npcList) {
       let actor = game.actors.get(actorId)
       if (actor) {
-        formData.npcs.push(actor)
+        npcs.push(actor)
         newList.push(actorId)
       } else {
         toUpdate = true
       }
     }
-    formData.config = game.system.ecryme.config
-
     if (toUpdate) {
       this.settings.npcList = newList
-      //console.log("Going to update ...", this.settings)
-      game.settings.set("world", "character-summary-data", this.settings)
+      game.settings.set("fvtt-ecryme", "character-summary-data", this.settings)
+    }
+    return {
+      pcs,
+      npcs,
+      config: game.ecryme.config,
     }
-
-    return formData
   }
 
   /* -------------------------------------------- */
   updateNPC() {
-    game.settings.set("world", "character-summary-data", game.system.ecryme.charSummary.settings)
-    game.system.ecryme.charSummary.close()
-    setTimeout(function () { game.system.ecryme.charSummary.render(true) }, 500)
+    game.settings.set("fvtt-ecryme", "character-summary-data", this.settings)
+    this.close()
+    setTimeout(() => this.render(true), 500)
   }
 
   /* -------------------------------------------- */
-  async _onDrop(event) {
-    //console.log("Dragged data are : ", dragData)
-    let data = event.dataTransfer.getData('text/plain')
-    let dataItem = JSON.parse(data)
-    let actor = fromUuidSync(dataItem.uuid)
-    if (actor) {
-      game.system.ecryme.charSummary.settings.npcList.push(actor.id)
-      game.system.ecryme.charSummary.updateNPC()
+  _onDragOver(event) {
+    event.preventDefault()
+  }
 
+  /* -------------------------------------------- */
+  _onDrop(event) {
+    let data
+    try { data = JSON.parse(event.dataTransfer.getData('text/plain')) } catch(e) { return }
+    let actor = fromUuidSync(data.uuid)
+    if (actor) {
+      this.settings.npcList.push(actor.id)
+      this.updateNPC()
     } else {
       ui.notifications.warn("Pas d'acteur trouvé")
     }
   }
 
   /* -------------------------------------------- */
-  /** @override */
-  async activateListeners(html) {
-    super.activateListeners(html);
+  _onRender(context, options) {
+    super._onRender(context, options)
+    this.element.addEventListener("dragover", this._onDragOver.bind(this))
+    this.element.addEventListener("drop",     this._onDrop.bind(this))
+  }
 
-    html.find('.actor-open').click((event) => {
-      const li = $(event.currentTarget).parents(".item")
-      const actor = game.actors.get(li.data("actor-id"))
-      actor.sheet.render(true)
-    })
+  /* -------------------------------------------- */
+  static #onActorOpen(event, target) {
+    const actorId = target.closest("[data-actor-id]").dataset.actorId
+    game.actors.get(actorId)?.sheet.render(true)
+  }
 
-    html.find('.summary-roll').click((event) => {
-      const li = $(event.currentTarget).parents(".item")
-      const actor = game.actors.get(li.data("actor-id"))
-      let type = $(event.currentTarget).data("type")
-      let key = $(event.currentTarget).data("key")
-      actor.rollAttribut(key)
-    })
-
-    html.find('.actor-delete').click(event => {
-      const li = $(event.currentTarget).parents(".item");
-      let actorId = li.data("actor-id")
-      let newList = game.system.ecryme.charSummary.settings.npcList.filter(id => id != actorId)
-      game.system.ecryme.charSummary.settings.npcList = newList
-      game.system.ecryme.charSummary.updateNPC()
-    })
+  /* -------------------------------------------- */
+  static #onSummaryRoll(event, target) {
+    const actorId = target.closest("[data-actor-id]").dataset.actorId
+    const key     = target.dataset.key
+    game.actors.get(actorId)?.rollAttribut(key)
+  }
 
+  /* -------------------------------------------- */
+  static #onActorDelete(event, target) {
+    const actorId = target.closest("[data-actor-id]").dataset.actorId
+    this.settings.npcList = this.settings.npcList.filter(id => id !== actorId)
+    this.updateNPC()
   }
 
 }

modules/common/ecryme-utility.js

@@ -36,7 +36,7 @@ export class EcrymeUtility {
   /* -------------------------------------------- */
   static async init() {
     Hooks.on('renderChatLog', (log, html, data) => EcrymeUtility.chatListeners(html));
-    Hooks.on("getChatLogEntryContext", (html, options) => EcrymeUtility.chatMenuManager(html, options));
+    Hooks.on("getChatMessageContextOptions", (html, options) => EcrymeUtility.chatMenuManager(html, options));
 
     this.rollDataStore = {}
     this.defenderStore = {}
@@ -101,6 +101,13 @@ export class EcrymeUtility {
       restricted: true
     })
 
+    game.settings.register("fvtt-ecryme", "character-summary-data", {
+      scope: 'world',
+      config: false,
+      type: Object,
+      default: { npcList: [] }
+    })
+
     this.buildSkillConfig()
 
   }
@@ -123,13 +130,48 @@ export class EcrymeUtility {
 
   /*-------------------------------------------- */
   static buildSkillConfig() {
-    game.system.ecryme.config.skills = {}
-    for (let categKey in game.data.template.Actor.templates.core.skills) {
-      let category = game.data.template.Actor.templates.core.skills[categKey]
+    // Build skill configuration from DataModel structure
+    game.ecryme.config.skills = {}
+    
+    const skillCategories = {
+      physical: {
+        name: "ECRY.ui.physical",
+        skilllist: {
+          athletics: { key: "athletics", name: "ECRY.ui.athletics", max: 0, value: 0 },
+          driving: { key: "driving", name: "ECRY.ui.driving", max: 0, value: 0 },
+          fencing: { key: "fencing", name: "ECRY.ui.fencing", max: 0, value: 0 },
+          brawling: { key: "brawling", name: "ECRY.ui.brawling", max: 0, value: 0 },
+          shooting: { key: "shooting", name: "ECRY.ui.shooting", max: 0, value: 0 }
+        }
+      },
+      mental: {
+        name: "ECRY.ui.mental",
+        skilllist: {
+          anthropomecanology: { key: "anthropomecanology", name: "ECRY.ui.anthropomecanology", max: 10, value: 0 },
+          ecrymology: { key: "ecrymology", name: "ECRY.ui.ecrymology", max: 10, value: 0 },
+          traumatology: { key: "traumatology", name: "ECRY.ui.traumatology", max: 10, value: 0 },
+          traversology: { key: "traversology", name: "ECRY.ui.traversology", max: 10, value: 0 },
+          urbatechnology: { key: "urbatechnology", name: "ECRY.ui.urbatechnology", max: 10, value: 0 }
+        }
+      },
+      social: {
+        name: "ECRY.ui.social",
+        skilllist: {
+          quibbling: { key: "quibbling", name: "ECRY.ui.quibbling", max: 10, value: 0 },
+          creativity: { key: "creativity", name: "ECRY.ui.creativity", max: 10, value: 0 },
+          loquacity: { key: "loquacity", name: "ECRY.ui.loquacity", max: 10, value: 0 },
+          guile: { key: "guile", name: "ECRY.ui.guile", max: 10, value: 0 },
+          performance: { key: "performance", name: "ECRY.ui.performance", max: 10, value: 0 }
+        }
+      }
+    }
+    
+    for (let categKey in skillCategories) {
+      let category = skillCategories[categKey]
       for (let skillKey in category.skilllist) {
-        let skill = foundry.utils.duplicate(category.skilllist[skillKey])
-        skill.categKey = categKey // Auto reference the category
-        game.system.ecryme.config.skills[skillKey] = skill
+        let skill = foundry.utils.deepClone(category.skilllist[skillKey])
+        skill.categKey = categKey
+        game.ecryme.config.skills[skillKey] = skill
       }
     }
   }
@@ -155,8 +197,8 @@ export class EcrymeUtility {
   /* -------------------------------------------- */
   static getActorFromRollData(rollData) {
     let actor = game.actors.get(rollData.actorId)
-    if (rollData.tokenId) {
-      let token = canvas.tokens.placeables.find(t => t.id == rollData.tokenId)
+    if (rollData.defenderTokenId) {
+      let token = canvas.tokens.placeables.find(t => t.id == rollData.defenderTokenId)
       if (token) {
         actor = token.actor
       }
@@ -176,6 +218,8 @@ export class EcrymeUtility {
       type: "confront-data",
       rollData1: this.confrontData1,
       rollData2: this.confrontData2,
+      alias:    this.confrontData1.alias,
+      actorImg: this.confrontData1.actorImg,
     }
     // Compute margin
     confront.marginExecution = this.confrontData1.executionTotal - this.confrontData2.preservationTotal
@@ -185,19 +229,19 @@ export class EcrymeUtility {
     let maxMargin // Dummy max
     if (confront.marginExecution > 0) { // Successful hit
       // Limit with skill+spec
-      maxMargin = confront.rollData1.skill.value + ((confront.rollData1.spec) ? 2 : 0)
+      maxMargin = confront.rollData1.skill.max + ((confront.rollData1.spec) ? 2 : 0)
       confront.marginExecution = Math.min(confront.marginExecution, maxMargin)
     } else { // Failed hit
-      maxMargin = confront.rollData2.skill.value + ((confront.rollData2.spec) ? 2 : 0)
+      maxMargin = confront.rollData2.skill.max + ((confront.rollData2.spec) ? 2 : 0)
       confront.marginExecution = -Math.min(Math.abs(confront.marginExecution), maxMargin)
     }
 
     if (confront.marginPreservation > 0) { // Successful defense
       // Limit with skill+spec
-      maxMargin = confront.rollData1.skill.value + ((confront.rollData1.spec) ? 2 : 0)
+      maxMargin = confront.rollData1.skill.max + ((confront.rollData1.spec) ? 2 : 0)
       confront.marginPreservation = Math.min(confront.marginPreservation, maxMargin)
     } else { // Failed defense
-      maxMargin = confront.rollData2.skill.value + ((confront.rollData2.spec) ? 2 : 0)
+      maxMargin = confront.rollData2.skill.max + ((confront.rollData2.spec) ? 2 : 0)
       confront.marginPreservation = - Math.min(Math.abs(confront.marginPreservation), maxMargin)
     }
 
@@ -220,7 +264,7 @@ export class EcrymeUtility {
     }
 
     let msg = await this.createChatWithRollMode(this.confrontData1.alias, {
-      content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-confrontation-result.hbs`, confront)
+      content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-confrontation-result.hbs`, confront)
     })
     await msg.setFlag("world", "ecryme-rolldata", confront)
     console.log("Confront result", confront)
@@ -243,7 +287,7 @@ export class EcrymeUtility {
       rollData.marginPreservation = -1
     }
     let msg = await this.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-cephaly-result.hbs`, rollData)
+      content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-cephaly-result.hbs`, rollData)
     })
     msg.setFlag("world", "ecryme-rolldata", rollData)
     console.log("Cephaly result", rollData)
@@ -273,20 +317,17 @@ export class EcrymeUtility {
     let canTranscendRoll = []
     for (let i = 1; i <= 10; i++) {
       canTranscendRoll[i] = function (li) {
-        let message = game.messages.get(li.attr("data-message-id"))
+        let message = game.messages.get($(li).attr("data-message-id"))
         let rollData = message.getFlag("world", "rolldata")
         //console.log(">>>>>>>>>>>>>>>>>>>>>>>>>> Menu !!!!", rollData)
-        if (rollData.skill && rollData.skill.value >= i && !rollData.transcendUsed && rollData.spec) {
-          return true
-        }
-        return false
+        return (rollData?.skill?.value >= i && !rollData.transcendUsed && rollData.spec)
       }
       options.push({
         name: game.i18n.localize("ECRY.chat.spectranscend") + i,
         icon: '<i class="fas fa-plus-square"></i>',
         condition: canTranscendRoll[i],
         callback: li => {
-          let message = game.messages.get(li.attr("data-message-id"))
+          let message = game.messages.get($(li).attr("data-message-id"))
           let rollData = message.getFlag("world", "rolldata")
           EcrymeUtility.transcendFromSpec(rollData, i).catch("Error on Transcend")
         }
@@ -297,27 +338,35 @@ export class EcrymeUtility {
   /* -------------------------------------------- */
   static async chatListeners(html) {
 
-    html.on("click", '.button-select-confront', event => {
+    $(html).on("click", '.button-select-confront', event => {
       let messageId = EcrymeUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let rollData = message.getFlag("world", "ecryme-rolldata")
       ui.notifications.info(game.i18n.localize("ECRY.chat.confrontselect"))
       EcrymeUtility.manageConfrontation(rollData)
     })
-    html.on("click", '.button-apply-cephaly-difficulty', event => {
+    $(html).on("click", '.button-apply-cephaly-difficulty', event => {
       let messageId = EcrymeUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let rollData = message.getFlag("world", "ecryme-rolldata")
       let difficulty = $("#" + rollData.rollId + "-cephaly-difficulty").val()
       EcrymeUtility.manageCephalyDifficulty(rollData, difficulty)
     })
-    html.on("click", '.button-apply-impact', event => {
+    $(html).on("click", '.button-apply-impact', event => {
       let messageId = EcrymeUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
-      let actor = game.actors.get($(event.currentTarget).data("actor-id"))
+      let tokenId = $(event.currentTarget).data("token-id")
+      let actor
+      if (!tokenId) {
+        actorId = $(event.currentTarget).data("actor-id")
+        actor = game.actors.get(actorId)
+      } else {
+        let token = canvas.tokens.placeables.find(t => t.id == tokenId)
+        actor = token?.actor
+      }
       actor.modifyImpact($(event.currentTarget).data("impact-type"), $(event.currentTarget).data("impact"), 1)
     })
-    html.on("click", '.button-apply-bonus', event => {
+    $(html).on("click", '.button-apply-bonus', event => {
       let messageId = EcrymeUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let actor = game.actors.get($(event.currentTarget).data("actor-id"))
@@ -338,8 +387,11 @@ export class EcrymeUtility {
       'systems/fvtt-ecryme/templates/dialogs/partial-confront-dice-area.hbs',
       'systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs',
       'systems/fvtt-ecryme/templates/actors/partial-impacts.hbs',
+      'systems/fvtt-ecryme/templates/actors/partials/actor-header.hbs',
+      'systems/fvtt-ecryme/templates/items/partials/item-header.hbs',
+      'systems/fvtt-ecryme/templates/items/partials/item-description.hbs',
     ]
-    return loadTemplates(templatePaths);
+    return foundry.applications.handlebars.loadTemplates(templatePaths);
   }
 
   /* -------------------------------------------- */
@@ -405,7 +457,7 @@ export class EcrymeUtility {
 
     let id = rollData.rollId
     let oldRollData = this.rollDataStore[id] || {}
-    let newRollData = foundry.utils.mergeObject(oldRollData, rollData)
+    let newRollData = { ...oldRollData, ...rollData }
     this.rollDataStore[id] = newRollData
   }
 
@@ -416,7 +468,7 @@ export class EcrymeUtility {
       let rollData = msg.data.rollData
       if (game.user.isGM) {
         let chatMsg = await this.createChatMessage(rollData.alias, "blindroll", {
-          content: await renderTemplate(msg.data.template, rollData),
+          content: await foundry.applications.handlebars.renderTemplate(msg.data.template, rollData),
           whisper: game.user.id
         })
         chatMsg.setFlag("world", "ecryme-rolldata", rollData)
@@ -428,7 +480,7 @@ export class EcrymeUtility {
   static async searchItem(dataItem) {
     let item
     if (dataItem.pack) {
-      let id = dataItem.id || dataItem._id
+      let id = dataItem.id
       let items = await this.loadCompendium(dataItem.pack, item => item.id == id)
       item = items[0] || undefined
     } else {
@@ -447,7 +499,7 @@ export class EcrymeUtility {
 
     if (["gmroll", "blindroll"].includes(chatData.rollMode)) chatData["whisper"] = ChatMessage.getWhisperRecipients("GM").map(u => u.id);
     if (chatData.rollMode === "blindroll") chatData["blind"] = true;
-    else if (chatData.rollMode === "selfroll") chatData["whisper"] = [game.user];
+    else if (chatData.rollMode === "selfroll") chatData["whisper"] = [game.user.id];
 
     if (forceWhisper) { // Final force !
       chatData["speaker"] = ChatMessage.getSpeaker();
@@ -499,7 +551,7 @@ export class EcrymeUtility {
     rollData.margin = rollData.total - rollData.difficulty
     if (rollData.total > rollData.difficulty) {
       rollData.isSuccess = true
-      let maxMargin = rollData.skill.value + ((rollData.spec) ? 2 : 0)
+      let maxMargin = rollData.skill.max + ((rollData.spec) ? 2 : 0)
       rollData.margin = Math.min(rollData.margin, maxMargin)
     }
   }
@@ -515,11 +567,12 @@ export class EcrymeUtility {
       diceFormula = (isConfrontation) ? "5d6kl2" : "3d6kl2"
     }
     if (rollData.skill) {
-      diceFormula += "+" + rollData.skill.value
+      diceFormula += "+" + rollData.skill.max
     }
     if (rollData.skillTranscendence) {
-      diceFormula += "+" + rollData.skillTranscendence
-      actor.spentSkillTranscendence(rollData.skill, rollData.skillTranscendence)
+      let toSpend = Math.min(rollData.skillTranscendence, rollData.skill.value)
+      diceFormula += "+" + toSpend
+      actor.spentSkillTranscendence(rollData.skill, toSpend)
     }
     if (rollData.selectedSpecs && rollData.selectedSpecs.length > 0) {
       rollData.spec = actor.getSpecialization(rollData.selectedSpecs[0])
@@ -568,14 +621,14 @@ export class EcrymeUtility {
     // Performs roll
     let myRoll = await new Roll(diceFormula).roll()
     await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
-    rollData.roll = foundry.utils.duplicate(myRoll)
+    rollData.roll = foundry.utils.deepClone(myRoll)
     rollData.total = myRoll.total
     rollData.diceSum = myRoll.terms[0].total
 
     this.computeResults(rollData)
 
     let msg = await this.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-generic-result.hbs`, rollData)
+      content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-generic-result.hbs`, rollData)
     })
     await msg.setFlag("world", "ecryme-rolldata", rollData)
     console.log("Rolldata result", rollData)
@@ -592,7 +645,7 @@ export class EcrymeUtility {
     actor.spentSkillTranscendence(rollData.skill, value)
 
     let msg = await this.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-generic-result.hbs`, rollData)
+      content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-generic-result.hbs`, rollData)
     })
     await msg.setFlag("world", "ecryme-rolldata", rollData)
   }
@@ -696,7 +749,7 @@ export class EcrymeUtility {
       useSpleen: false,
       useIdeal: false,
       impactMalus: 0,
-      config: foundry.utils.duplicate(game.system.ecryme.config)
+      config: foundry.utils.deepClone(game.ecryme.config)
     }
     EcrymeUtility.updateWithTarget(rollData)
     return rollData
@@ -718,29 +771,9 @@ export class EcrymeUtility {
   /* -------------------------------------------- */
   static async confirmDelete(actorSheet, li) {
     let itemId = li.data("item-id");
-    let msgTxt = "<p>Are you sure to remove this Item ?";
-    let buttons = {
-      delete: {
-        icon: '<i class="fas fa-check"></i>',
-        label: "Yes, remove it",
-        callback: () => {
+    if (!confirm("Etes vous certain de souhaiter envoyer cet item dans les limbes ?")) return;
     actorSheet.actor.deleteEmbeddedDocuments("Item", [itemId]);
     li.slideUp(200, () => actorSheet.render(false));
   }
-      },
-      cancel: {
-        icon: '<i class="fas fa-times"></i>',
-        label: "Cancel"
-      }
-    }
-    msgTxt += "</p>";
-    let d = new Dialog({
-      title: "Confirm removal",
-      content: msgTxt,
-      buttons: buttons,
-      default: "cancel"
-    });
-    d.render(true);
-  }
 
 }

modules/dialogs/ecryme-confront-dialog.js

@@ -1,168 +1,191 @@
 import { EcrymeUtility } from "../common/ecryme-utility.js";
-import { EcrymeRollDialog } from "./ecryme-roll-dialog.js";
 
-export class EcrymeConfrontDialog extends Dialog {
+const { HandlebarsApplicationMixin } = foundry.applications.api
+
+/**
+ * Main confrontation dialog — Application V2 version.
+ * Features drag-and-drop of dice from the pool to execution/preservation slots.
+ * All event listeners (change + drag-drop) are bound once via _listenersAdded guard.
+ */
+export class EcrymeConfrontDialog extends HandlebarsApplicationMixin(foundry.applications.api.ApplicationV2) {
+
+  #dragDrop
+  _listenersAdded = false
+
+  /* -------------------------------------------- */
+  constructor(actor, rollData, options = {}) {
+    super(options)
+    this.actor        = actor
+    this.rollData     = rollData
+    this.buttonDisabled = true
+    this.#dragDrop    = this.#createDragDropHandlers()
+  }
+
+  /* -------------------------------------------- */
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["fvtt-ecryme", "ecryme-confrontation-dialog"],
+    position: { width: 640 },
+    window: { title: "ECRY.ui.confront" },
+    dragDrop: [{ dragSelector: ".confront-dice-container", dropSelector: null }],
+    actions: {
+      launchConfront: EcrymeConfrontDialog.#onLaunchConfront,
+      cancel:         EcrymeConfrontDialog.#onCancel,
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    content: { template: "systems/fvtt-ecryme/templates/dialogs/confront-dialog.hbs" },
+  }
 
   /* -------------------------------------------- */
   static async create(actor, rollData) {
-
-    let options = foundry.utils.mergeObject(super.defaultOptions, {
-      classes: ["fvtt-ecryme ecryme-confrontation-dialog"],
-      dragDrop: [{ dragSelector: ".confront-dice-container", dropSelector: null }],
-      width: 620, height: 'fit-content', 'z-index': 99999
-    });
-
-    let html = await renderTemplate('systems/fvtt-ecryme/templates/dialogs/confront-dialog.hbs', rollData);
-    return new EcrymeConfrontDialog(actor, rollData, html, options);
+    return new EcrymeConfrontDialog(actor, rollData)
   }
 
   /* -------------------------------------------- */
-  constructor(actor, rollData, html, options, close = undefined) {
-    let conf = {
-      title: game.i18n.localize("ECRY.ui.confront"),
-      content: html,
-      buttons: {
-        launchConfront: {
-          icon: '<i class="fas fa-check"></i>',
-          label: game.i18n.localize("ECRY.ui.launchconfront"),
-          callback: () => { this.launchConfront().catch("Error when launching Confrontation") }
-        },
-        cancel: {
-          icon: '<i class="fas fa-times"></i>',
-          label: game.i18n.localize("ECRY.ui.cancel"),
-          callback: () => { this.close() }
+  async _prepareContext() {
+    return {
+      ...this.rollData,
+      config:         game.ecryme.config,
+      buttonDisabled: this.buttonDisabled,
     }
-      },
-      close: close
-    }
-
-    super(conf, options);
-
-    this.actor = actor;
-    this.rollData = rollData;
-
-    // Ensure button is disabled
-    setTimeout(function () { $(".launchConfront").attr("disabled", true) }, 180)
   }
 
   /* -------------------------------------------- */
-  async launchConfront() {
-    let msg = await EcrymeUtility.createChatMessage(this.rollData.alias, "blindroll", {
-      content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-confrontation-pending.hbs`, this.rollData)
+  /** Bind drag-drop and form-change listeners once; re-bind DragDrop on each render. */
+  _onRender(context, options) {
+    // DragDrop must be re-bound each render because the DOM is replaced
+    this.#dragDrop.forEach(d => d.bind(this.element))
+
+    // Form-change listener is bound once (event delegation survives DOM re-renders)
+    if (!this._listenersAdded) {
+      this._listenersAdded = true
+      this.element.addEventListener('change', this.#onFormChange.bind(this))
+    }
+  }
+
+  /* -------------------------------------------- */
+  #onFormChange(event) {
+    const target = event.target
+    switch (target.id) {
+      case 'bonusMalusPerso':
+        this.rollData.bonusMalusPerso = Number(target.value)
+        this.computeTotals()
+        break
+      case 'roll-specialization':
+        this.rollData.selectedSpecs = Array.from(target.selectedOptions).map(o => o.value)
+        this.computeTotals()
+        break
+      case 'roll-trait-bonus':
+        this.rollData.traitsBonusSelected = Array.from(target.selectedOptions).map(o => o.value)
+        this.computeTotals()
+        break
+      case 'roll-trait-malus':
+        this.rollData.traitsMalusSelected = Array.from(target.selectedOptions).map(o => o.value)
+        this.computeTotals()
+        break
+      case 'roll-select-transcendence':
+        this.rollData.skillTranscendence = Number(target.value)
+        this.computeTotals()
+        break
+      case 'roll-apply-transcendence':
+        this.rollData.applyTranscendence = target.value
+        this.computeTotals()
+        break
+      case 'annency-bonus':
+        this.rollData.annencyBonus = Number(target.value)
+        break
+    }
+  }
+
+  // #region Drag-and-Drop
+
+  #createDragDropHandlers() {
+    return this.options.dragDrop.map(d => {
+      d.permissions = {
+        dragstart: () => true,
+        drop:      () => true,
+      }
+      d.callbacks = {
+        dragstart: this._onDragStart.bind(this),
+        dragover:  this._onDragOver.bind(this),
+        drop:      this._onDrop.bind(this),
+      }
+      return new foundry.applications.ux.DragDrop.implementation(d)
     })
-    EcrymeUtility.blindMessageToGM( { rollData: this.rollData, template: "systems/fvtt-ecryme/templates/chat/chat-confrontation-pending.hbs" })
-    console.log("MSG", this.rollData)
-    msg.setFlag("world", "ecryme-rolldata", this.rollData)
-  }
-
-  /* -------------------------------------------- */
-  async refreshDice() {
-    this.rollData.filter = "execution"
-    let content = await renderTemplate("systems/fvtt-ecryme/templates/dialogs/partial-confront-dice-area.hbs", this.rollData )
-    content += await renderTemplate("systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs", this.rollData )
-    $("#confront-execution").html(content)
-
-    this.rollData.filter = "preservation"
-    content = await renderTemplate("systems/fvtt-ecryme/templates/dialogs/partial-confront-dice-area.hbs", this.rollData )
-    content += await renderTemplate("systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs", this.rollData )
-    $("#confront-preservation").html(content)
-
-    this.rollData.filter = "mainpool"
-    content = await renderTemplate("systems/fvtt-ecryme/templates/dialogs/partial-confront-dice-area.hbs", this.rollData )
-    $("#confront-dice-pool").html(content)
-    content = await renderTemplate("systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs", this.rollData )
-    $("#confront-bonus-pool").html(content)
-    
-  }
-  /* -------------------------------------------- */
-  async refreshDialog() {
-    const content = await renderTemplate("systems/fvtt-ecryme/templates/dialogs/confront-dialog.hbs", this.rollData)
-    this.data.content = content
-    this.render(true)
-
-    let button = this.buttonDisabled
-    setTimeout(function () { $(".launchConfront").attr("disabled", button) }, 180)
-  }
-  
-  /* ------------------ -------------------------- */
-  _canDragStart(selector) {
-    console.log("CAN DRAG START", selector, super._canDragStart(selector) )
-    return true
-  }
-  _canDragDrop(selector) {
-    console.log("CAN DRAG DROP", selector, super._canDragDrop(selector) )
-    return true
   }
 
   /* -------------------------------------------- */
   _onDragStart(event) {
-    console.log("DRAGSTART::::", event)
-    super._onDragStart(event)
-    let dragType = $(event.srcElement).data("drag-type")
-    let diceData = {}
-    console.log("DRAGTYPE", dragType)
-    if (dragType == "dice") {
+    const target   = event.target
+    const dragType = target.dataset.dragType
+    let diceData
+
+    if (dragType === "dice") {
       diceData = {
         dragType:  "dice",
-        diceIndex: $(event.srcElement).data("dice-idx"),
-        diceValue: $(event.srcElement).data("dice-value"),
+        diceIndex: target.dataset.diceIdx,
+        diceValue: target.dataset.diceValue,
       }
     } else {
       diceData = {
         dragType:   "bonus",
-        bonusIndex: $(event.srcElement).data("bonus-idx"),
-        bonusValue: 1
+        bonusIndex: target.dataset.bonusIdx,
+        bonusValue: 1,
       }
     }
-    event.dataTransfer.setData("text/plain", JSON.stringify(diceData));
+    event.dataTransfer.setData("text/plain", JSON.stringify(diceData))
+  }
+
+  /* -------------------------------------------- */
+  _onDragOver(event) {
+    event.preventDefault()
   }
 
   /* -------------------------------------------- */
   _onDrop(event) {
-    let dataJSON = event.dataTransfer.getData('text/plain')
-    let data = JSON.parse(dataJSON)
-    if ( data.dragType == "dice") {
-      let idx = Number(data.diceIndex)
-      console.log("DATA", data, event, event.srcElement.className)
-      if (event.srcElement.className.includes("execution") && 
-        this.rollData.availableDices.filter(d => d.location == "execution").length < 2) {
+    let data
+    try { data = JSON.parse(event.dataTransfer.getData("text/plain")) }
+    catch (e) { return }
+
+    // Walk up the DOM to find a meaningful drop area
+    const executionArea   = event.target.closest('.confront-execution-area')
+    const preservationArea = event.target.closest('.confront-preservation-area')
+    const diceList        = event.target.closest('.confrontation-dice-list')
+    const bonusList       = event.target.closest('.confrontation-bonus-list')
+
+    if (data.dragType === "dice") {
+      const idx = Number(data.diceIndex)
+      if (executionArea && this.rollData.availableDices.filter(d => d.location === "execution").length < 2) {
         this.rollData.availableDices[idx].location = "execution"
-      }
-      if (event.srcElement.className.includes("preservation") && 
-        this.rollData.availableDices.filter(d => d.location == "preservation").length < 2) {
+      } else if (preservationArea && this.rollData.availableDices.filter(d => d.location === "preservation").length < 2) {
         this.rollData.availableDices[idx].location = "preservation"
-      }
-      if (event.srcElement.className.includes("dice-list")) {
+      } else if (diceList) {
         this.rollData.availableDices[idx].location = "mainpool"
       }
 
-      if (this.rollData.availableDices.filter(d => d.location == "execution").length == 2 && this.rollData.availableDices.filter(d => d.location == "preservation").length == 2) {
-        this.buttonDisabled = false
-      } else {
-        this.buttonDisabled = true
-      }  
-    } else {
-      let idx = Number(data.bonusIndex)
-      if (event.srcElement.className.includes("execution")) {
-        this.rollData.confrontBonus[idx].location = "execution"
-      }
-      if (event.srcElement.className.includes("preservation")) {
-        this.rollData.confrontBonus[idx].location = "preservation"
-      }
-      if (event.srcElement.className.includes("bonus-list")) {
-        this.rollData.confrontBonus[idx].location = "mainpool"
-      }
+      const execCount  = this.rollData.availableDices.filter(d => d.location === "execution").length
+      const presCount  = this.rollData.availableDices.filter(d => d.location === "preservation").length
+      this.buttonDisabled = !(execCount === 2 && presCount === 2)
+
+    } else if (data.dragType === "bonus") {
+      const idx = Number(data.bonusIndex)
+      if (executionArea)   this.rollData.confrontBonus[idx].location = "execution"
+      else if (preservationArea) this.rollData.confrontBonus[idx].location = "preservation"
+      else if (bonusList)  this.rollData.confrontBonus[idx].location = "mainpool"
     }
 
-    // Manage total values
     this.computeTotals()
-
   }
+
+  // #endregion
+
   /* -------------------------------------------- */
   processTranscendence() {
-    // Apply Transcend if needed
     if (this.rollData.skillTranscendence > 0) {
-      if (this.rollData.applyTranscendence == "execution") {
+      if (this.rollData.applyTranscendence === "execution") {
         this.rollData.executionTotal   += Number(this.rollData.skillTranscendence)
       } else {
         this.rollData.preservationTotal += Number(this.rollData.skillTranscendence)
@@ -172,94 +195,78 @@ export class EcrymeConfrontDialog extends Dialog {
 
   /* -------------------------------------------- */
   computeTotals() {
-    let rollData = this.rollData
-    let actor = game.actors.get(rollData.actorId)
+    const rollData = this.rollData
+    const actor    = game.actors.get(rollData.actorId)
 
-    rollData.executionTotal = rollData.availableDices.filter(d => d.location == "execution").reduce((previous, current) => {
-      return previous + current.result
-    }, rollData.skill.value)
-    rollData.executionTotal = rollData.confrontBonus.filter(d => d.location == "execution").reduce((previous, current) => {
-      return previous + 1
-    }, rollData.executionTotal)
+    rollData.executionTotal = rollData.availableDices
+      .filter(d => d.location === "execution")
+      .reduce((acc, d) => acc + d.result, rollData.skill.max)
+    rollData.executionTotal = rollData.confrontBonus
+      .filter(d => d.location === "execution")
+      .reduce((acc) => acc + 1, rollData.executionTotal)
 
-    rollData.preservationTotal = rollData.availableDices.filter(d => d.location == "preservation").reduce((previous, current) => {
-      return previous + current.result
-    }, rollData.skill.value)
-    rollData.preservationTotal = rollData.confrontBonus.filter(d => d.location == "preservation").reduce((previous, current) => {
-      return previous + 1
-    }, rollData.preservationTotal)
+    rollData.preservationTotal = rollData.availableDices
+      .filter(d => d.location === "preservation")
+      .reduce((acc, d) => acc + d.result, rollData.skill.max)
+    rollData.preservationTotal = rollData.confrontBonus
+      .filter(d => d.location === "preservation")
+      .reduce((acc) => acc + 1, rollData.preservationTotal)
 
     this.processTranscendence()
 
-    if (rollData.selectedSpecs && rollData.selectedSpecs.length > 0) {
-      rollData.spec = foundry.utils.duplicate(actor.getSpecialization(rollData.selectedSpecs[0]))    
+    // Specialization
+    if (rollData.selectedSpecs?.length > 0) {
+      rollData.spec      = foundry.utils.deepClone(actor.getSpecialization(rollData.selectedSpecs[0]))
       rollData.specApplied = true
       rollData.executionTotal   += 2
       rollData.preservationTotal += 2
     }
-    if ( rollData.specApplied && rollData.selectedSpecs.length == 0) {
+    if (rollData.specApplied && rollData.selectedSpecs?.length === 0) {
       rollData.spec      = undefined
       rollData.specApplied = false
     }
+
+    // Traits bonus/malus
     rollData.bonusMalusTraits = 0
-    for (let t of rollData.traitsBonus) {
-      t.activated = false
-    }
-    for (let t of rollData.traitsMalus) {
-      t.activated = false
-    }
-    if (rollData.traitsBonusSelected && rollData.traitsBonusSelected.length > 0) {
-      for (let id of rollData.traitsBonusSelected) {
-        let trait = rollData.traitsBonus.find(t => t._id == id)
-        trait.activated = true
-        rollData.bonusMalusTraits += Number(trait.system.level)
-      }
-    }
-    if (rollData.traitsMalusSelected && rollData.traitsMalusSelected.length > 0) {
-      for (let id of rollData.traitsMalusSelected) {
-        let trait = rollData.traitsMalus.find(t => t._id == id)
-        trait.activated = true
-        rollData.bonusMalusTraits -= Number(trait.system.level)
+    for (const t of rollData.traitsBonus)  t.activated = false
+    for (const t of rollData.traitsMalus)  t.activated = false
+
+    for (const id of (rollData.traitsBonusSelected ?? [])) {
+      const trait = rollData.traitsBonus.find(t => t.id === id)
+      if (trait) { trait.activated = true; rollData.bonusMalusTraits += Number(trait.system.level) }
     }
+    for (const id of (rollData.traitsMalusSelected ?? [])) {
+      const trait = rollData.traitsMalus.find(t => t.id === id)
+      if (trait) { trait.activated = true; rollData.bonusMalusTraits -= Number(trait.system.level) }
     }
 
     rollData.executionTotal   += Number(rollData.bonusMalusTraits) + Number(rollData.bonusMalusPerso)
     rollData.preservationTotal += Number(rollData.bonusMalusTraits) + Number(rollData.bonusMalusPerso)
 
-    this.refreshDialog()
+    this.render()
   }
 
   /* -------------------------------------------- */
-  activateListeners(html) {
-    super.activateListeners(html);
+  async launchConfront() {
+    const msg = await EcrymeUtility.createChatMessage(this.rollData.alias, "blindroll", {
+      content: await foundry.applications.handlebars.renderTemplate(
+        `systems/fvtt-ecryme/templates/chat/chat-confrontation-pending.hbs`, this.rollData
+      ),
+    })
+    EcrymeUtility.blindMessageToGM({
+      rollData: this.rollData,
+      template: "systems/fvtt-ecryme/templates/chat/chat-confrontation-pending.hbs",
+    })
+    msg.setFlag("world", "ecryme-rolldata", this.rollData)
+  }
 
-    html.find('#bonusMalusPerso').change((event) => {
-      this.rollData.bonusMalusPerso = event.currentTarget.value
-      this.computeTotals()
-    })
-    html.find('#roll-specialization').change((event) => {
-      this.rollData.selectedSpecs = $('#roll-specialization').val()
-      this.computeTotals()
-    })
-    html.find('#roll-trait-bonus').change((event) => {
-      this.rollData.traitsBonusSelected = $('#roll-trait-bonus').val()
-      this.computeTotals()
-    })
-    html.find('#roll-trait-malus').change((event) => {
-      this.rollData.traitsMalusSelected = $('#roll-trait-malus').val()
-      this.computeTotals()
-    })
-    html.find('#roll-select-transcendence').change((event) => {
-      this.rollData.skillTranscendence = Number($('#roll-select-transcendence').val())
-      this.computeTotals()
-    })
-    html.find('#roll-apply-transcendence').change((event) => {
-      this.rollData.applyTranscendence = $('#roll-apply-transcendence').val()
-      this.computeTotals()
-    })
-    html.find('#annency-bonus').change((event) => {
-      this.rollData.annencyBonus = Number(event.currentTarget.value)
-    })
+  /* -------------------------------------------- */
+  static async #onLaunchConfront(event, target) {
+    await this.launchConfront()
+    this.close()
+  }
 
+  static #onCancel(event, target) {
+    this.close()
   }
 }

modules/dialogs/ecryme-confront-start-dialog.js

@@ -1,74 +1,80 @@
 import { EcrymeUtility } from "../common/ecryme-utility.js";
 import { EcrymeConfrontDialog } from "./ecryme-confront-dialog.js";
 
-export class EcrymeConfrontStartDialog extends Dialog {
+const { HandlebarsApplicationMixin } = foundry.applications.api
+
+/**
+ * Confrontation start dialog — Application V2 version.
+ * Player picks which dice formula to roll (normal / spleen / ideal),
+ * the dice are rolled and the main EcrymeConfrontDialog is opened.
+ */
+export class EcrymeConfrontStartDialog extends HandlebarsApplicationMixin(foundry.applications.api.ApplicationV2) {
+
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["fvtt-ecryme", "ecryme-confront-start-dialog"],
+    position: { width: 540 },
+    window: { title: "ECRY.ui.confront" },
+    actions: {
+      rollNormal: EcrymeConfrontStartDialog.#onRollNormal,
+      rollSpleen: EcrymeConfrontStartDialog.#onRollSpleen,
+      rollIdeal:  EcrymeConfrontStartDialog.#onRollIdeal,
+      cancel:     EcrymeConfrontStartDialog.#onCancel,
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    content: { template: "systems/fvtt-ecryme/templates/dialogs/confront-start-dialog.hbs" },
+  }
+
+  /* -------------------------------------------- */
+  constructor(actor, rollData, options = {}) {
+    super(options)
+    this.actor    = actor?.token?.actor ?? actor
+    this.rollData = rollData
+  }
 
   /* -------------------------------------------- */
   static async create(actor, rollData) {
-
-    let options = { classes: ["fvtt-ecryme ecryme-confront-dialog"], width: 540, height: 'fit-content', 'z-index': 99999 }
-    let html = await renderTemplate('systems/fvtt-ecryme/templates/dialogs/confront-start-dialog.hbs', rollData);
-    return new EcrymeConfrontStartDialog(actor, rollData, html, options);
+    if (!actor)    throw new Error("Ecryme | No actor provided for confront dialog")
+    if (!rollData) throw new Error("Ecryme | No roll data provided for confront dialog")
+    if (actor?.token) rollData.tokenId = actor.token.id
+    return new EcrymeConfrontStartDialog(actor, rollData)
   }
 
   /* -------------------------------------------- */
-  constructor(actor, rollData, html, options, close = undefined) {
-    let conf = {
-      title: game.i18n.localize("ECRY.ui.confront"),
-      content: html,
-      buttons: {
-        rollNormal: {
-          icon: '<i class="fas fa-check"></i>',
-          label: game.i18n.localize("ECRY.ui.rollnormal"),
-          callback: () => { this.rollConfront("4d6") }
-        },
-        rollSpleen: {
-          icon: '<i class="fas fa-check"></i>',
-          label: game.i18n.localize("ECRY.ui.rollspleen"),
-          callback: () => { this.rollConfront("5d6kl4") }
-        },
-        rollIdeal: {
-          icon: '<i class="fas fa-check"></i>',
-          label: game.i18n.localize("ECRY.ui.rollideal"),
-          callback: () => { this.rollConfront("5d6kh4") }
-        },
-        cancel: {
-          icon: '<i class="fas fa-times"></i>',
-          label: game.i18n.localize("ECRY.ui.cancel"),
-          callback: () => { this.close() }
+  async _prepareContext() {
+    return {
+      ...this.rollData,
+      config: game.ecryme.config,
     }
-      },
-      close: close
-    }
-
-    super(conf, options);
-
-    this.actor = actor;
-    this.rollData = rollData;
   }
 
   /* -------------------------------------------- */
-  async rollConfront( diceFormula ) {
-    // Do the initial roll
-    let myRoll = await new Roll(diceFormula).roll()
+  async #rollConfront(diceFormula) {
+    const myRoll = await new Roll(diceFormula).roll()
     await EcrymeUtility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
-    // Fill the available dice table
-    let rollData = this.rollData
-    rollData.roll = foundry.utils.duplicate(myRoll)
+
+    const rollData = this.rollData
+    rollData.roll = foundry.utils.deepClone(myRoll)
     rollData.availableDices = []
-    for (let result of myRoll.terms[0].results) {
+    for (const result of myRoll.terms[0].results) {
       if (!result.discarded) {
-        let resultDup = foundry.utils.duplicate(result)
-        resultDup.location = "mainpool"
-        rollData.availableDices.push(resultDup)
+        const dup = foundry.utils.deepClone(result)
+        dup.location = "mainpool"
+        rollData.availableDices.push(dup)
       }
     }
-    let confrontDialog = await EcrymeConfrontDialog.create(this.actor, rollData)
+
+    const confrontDialog = await EcrymeConfrontDialog.create(this.actor, rollData)
     confrontDialog.render(true)
+    this.close()
   }
 
   /* -------------------------------------------- */
-  activateListeners(html) {
-    super.activateListeners(html);
-  }
+  static async #onRollNormal(event, target) { await this.#rollConfront("4d6")     }
+  static async #onRollSpleen(event, target) { await this.#rollConfront("5d6kl4")  }
+  static async #onRollIdeal(event, target)  { await this.#rollConfront("5d6kh4")  }
+  static        #onCancel(event, target)    { this.close()                         }
 }

modules/dialogs/ecryme-roll-dialog.js

@@ -1,87 +1,78 @@
 import { EcrymeUtility } from "../common/ecryme-utility.js";
 
-export class EcrymeRollDialog extends Dialog {
+const { HandlebarsApplicationMixin } = foundry.applications.api
+
+/**
+ * Roll dialog — Application V2 version.
+ * Reads all form values at roll time (no live tracking needed).
+ */
+export class EcrymeRollDialog extends HandlebarsApplicationMixin(foundry.applications.api.ApplicationV2) {
+
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["fvtt-ecryme", "ecryme-roll-dialog"],
+    position: { width: 540 },
+    window: { title: "ECRY.ui.rolltitle" },
+    actions: {
+      roll:   EcrymeRollDialog.#onRoll,
+      cancel: EcrymeRollDialog.#onCancel,
+    },
+  }
+
+  /** @override */
+  static PARTS = {
+    content: { template: "systems/fvtt-ecryme/templates/dialogs/roll-dialog-generic.hbs" },
+  }
+
+  /* -------------------------------------------- */
+  constructor(actor, rollData, options = {}) {
+    super(options)
+    this.actor    = actor
+    this.rollData = rollData
+  }
 
   /* -------------------------------------------- */
   static async create(actor, rollData) {
-
-    let options = { classes: ["ecryme-roll-dialog"], width: 540, height: 'fit-content', 'z-index': 99999 }
-    let html = await renderTemplate('systems/fvtt-ecryme/templates/dialogs/roll-dialog-generic.hbs', rollData);
-    return new EcrymeRollDialog(actor, rollData, html, options);
+    return new EcrymeRollDialog(actor, rollData)
   }
 
   /* -------------------------------------------- */
-  constructor(actor, rollData, html, options, close = undefined) {
-    let conf = {
-      title: game.i18n.localize("ECRY.ui.rolltitle"),
-      content: html,
-      buttons: {
-        roll: {
-          icon: '<i class="fas fa-check"></i>',
-          label: game.i18n.localize("ECRY.ui.roll"),
-          callback: () => { this.roll() }
-        },
-        cancel: {
-          icon: '<i class="fas fa-times"></i>',
-          label: game.i18n.localize("ECRY.ui.cancel"),
-          callback: () => { this.close() }
+  async _prepareContext() {
+    return {
+      ...this.rollData,
+      config: game.ecryme.config,
     }
-      },
-      close: close
-    }
-
-    super(conf, options);
-
-    this.actor = actor;
-    this.rollData = rollData;
   }
 
   /* -------------------------------------------- */
-  roll() {
+  /** Read all form values at roll time, then execute. */
+  static #onRoll(event, target) {
+    const el = this.element
+
+    const bonusEl      = el.querySelector('#bonusMalusPerso')
+    const diffEl       = el.querySelector('#roll-difficulty')
+    const specEl       = el.querySelector('#roll-specialization')
+    const traitBonusEl = el.querySelector('#roll-trait-bonus')
+    const traitMalusEl = el.querySelector('#roll-trait-malus')
+    const transcEl     = el.querySelector('#roll-select-transcendence')
+    const spleenEl     = el.querySelector('#roll-use-spleen')
+    const idealEl      = el.querySelector('#roll-use-ideal')
+
+    if (bonusEl)      this.rollData.bonusMalusPerso    = Number(bonusEl.value)
+    if (diffEl)       this.rollData.difficulty         = Number(diffEl.value) || 0
+    if (specEl)       this.rollData.selectedSpecs      = Array.from(specEl.selectedOptions).map(o => o.value)
+    if (traitBonusEl) this.rollData.traitsBonus        = Array.from(traitBonusEl.selectedOptions).map(o => o.value)
+    if (traitMalusEl) this.rollData.traitsMalus        = Array.from(traitMalusEl.selectedOptions).map(o => o.value)
+    if (transcEl)     this.rollData.skillTranscendence = Number(transcEl.value)
+    if (spleenEl)     this.rollData.useSpleen          = spleenEl.checked
+    if (idealEl)      this.rollData.useIdeal           = idealEl.checked
+
     EcrymeUtility.rollEcryme(this.rollData)
+    this.close()
   }
 
   /* -------------------------------------------- */
-  async refreshDialog() {
-    const content = await renderTemplate("systems/fvtt-ecryme/templates/dialogs/roll-dialog-generic.hbs", this.rollData)
-    this.data.content = content
-    this.render(true)
-  }
-
-  /* -------------------------------------------- */
-  activateListeners(html) {
-    super.activateListeners(html);
-
-    var dialog = this;
-    function onLoad() {
-    }
-    $(function () { onLoad(); });
-
-    html.find('#bonusMalusPerso').change((event) => {
-      console.log("DIFF", event.currentTarget.value)
-      this.rollData.bonusMalusPerso = Number(event.currentTarget.value)
-    })
-    html.find('#roll-difficulty').change((event) => {
-      this.rollData.difficulty = Number(event.currentTarget.value) || 0
-    })
-    html.find('#roll-specialization').change((event) => {
-      this.rollData.selectedSpecs = $('#roll-specialization').val()
-    })
-    html.find('#roll-trait-bonus').change((event) => {
-      this.rollData.traitsBonus = $('#roll-trait-bonus').val()
-    })
-    html.find('#roll-trait-malus').change((event) => {
-      this.rollData.traitsMalus = $('#roll-trait-malus').val()
-    })
-    html.find('#roll-select-transcendence').change((event) => {
-      this.rollData.skillTranscendence = Number($('#roll-select-transcendence').val())
-    })    
-    html.find('#roll-use-spleen').change((event) => {
-      this.rollData.useSpleen = event.currentTarget.checked
-    })      
-    html.find('#roll-use-ideal').change((event) => {
-      this.rollData.useIdeal = event.currentTarget.checked
-    })      
-
+  static #onCancel(event, target) {
+    this.close()
   }
 }

modules/ecryme-main.js

@@ -5,19 +5,30 @@
  */
 
 /* -------------------------------------------- */
+const ECRYME_WELCOME_MESSAGE_URL = "https://www.uberwald.me/gitea/public/fvtt-ecryme/raw/branch/master/welcome-message-ecryme.html"
 
 /* -------------------------------------------- */
 // Import Modules
 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 { EcrymeItemSheet } from "./items/ecryme-item-sheet.js";
+import {
+  EcrymeEquipmentSheet,
+  EcrymeWeaponSheet,
+  EcrymeTraitSheet,
+  EcrymeSpecializationSheet,
+  EcrymeManeuverSheet
+} from "./items/sheets/_module.js";
+import {
+  EcrymeActorSheet,
+  EcrymeAnnencySheet
+} from "./actors/sheets/_module.js";
 import { EcrymeUtility } from "./common/ecryme-utility.js";
 import { EcrymeCombat } from "./app/ecryme-combat.js";
 import { EcrymeItem } from "./items/ecryme-item.js";
 import { EcrymeHotbar } from "./app/ecryme-hotbar.js"
 import { EcrymeCharacterSummary } from "./app/ecryme-summary-app.js"
 import { ECRYME_CONFIG } from "./common/ecryme-config.js"
+import * as models from "./models/_module.js"
 
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
@@ -26,12 +37,7 @@ import { ECRYME_CONFIG } from "./common/ecryme-config.js"
 /************************************************************************************/
 Hooks.once("init", async function () {
 
-  console.log(`Initializing Ecryme RPG`);
-
-  game.system.ecryme = {
-    config: ECRYME_CONFIG,
-    EcrymeHotbar
-  }
+  console.log(`Initializing Ecryme RPG System`);
 
   /* -------------------------------------------- */
   // preload handlebars templates
@@ -53,32 +59,65 @@ Hooks.once("init", async function () {
   // Define custom Entity classes
   CONFIG.Combat.documentClass = EcrymeCombat
   CONFIG.Actor.documentClass = EcrymeActor
+  CONFIG.Actor.dataModels = {
+    pc: models.EcrymePCDataModel,
+    npc: models.EcrymeNPCDataModel,
+    annency: models.EcrymeAnnencyDataModel
+  }
+
   CONFIG.Item.documentClass = EcrymeItem
+  CONFIG.Item.dataModels = {
+    equipment: models.EcrymeEquipmentDataModel,
+    weapon: models.EcrymeWeaponDataModel,
+    trait: models.EcrymeTraitDataModel,
+    specialization: models.EcrymeSpecializationDataModel,
+    maneuver: models.EcrymeManeuverDataModel
+  }
+
+  game.ecryme = {
+    config: ECRYME_CONFIG,
+    models,
+    EcrymeHotbar
+  }
 
   /* -------------------------------------------- */
   // Register sheet application classes
-  Actors.unregisterSheet("core", ActorSheet);
-  Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["pc"], makeDefault: true });
-  Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["npc"], makeDefault: true });
-  Actors.registerSheet("fvtt-ecryme", EcrymeAnnencySheet, { types: ["annency"], makeDefault: false });
+  foundry.documents.collections.Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["pc"], makeDefault: true });
+  foundry.documents.collections.Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["npc"], makeDefault: true });
+  foundry.documents.collections.Actors.registerSheet("fvtt-ecryme", EcrymeAnnencySheet, { types: ["annency"], makeDefault: true });
 
-  Items.unregisterSheet("core", ItemSheet);
-  Items.registerSheet("fvtt-ecryme", EcrymeItemSheet, { makeDefault: true });
+  foundry.documents.collections.Items.registerSheet("fvtt-ecryme", EcrymeEquipmentSheet, { types: ["equipment"], makeDefault: true });
+  foundry.documents.collections.Items.registerSheet("fvtt-ecryme", EcrymeWeaponSheet, { types: ["weapon"], makeDefault: true });
+  foundry.documents.collections.Items.registerSheet("fvtt-ecryme", EcrymeTraitSheet, { types: ["trait"], makeDefault: true });
+  foundry.documents.collections.Items.registerSheet("fvtt-ecryme", EcrymeSpecializationSheet, { types: ["specialization"], makeDefault: true });
+  foundry.documents.collections.Items.registerSheet("fvtt-ecryme", EcrymeManeuverSheet, { types: ["maneuver"], makeDefault: true });
 
   EcrymeUtility.init()
 
-  Babele.get().setSystemTranslationsDir("translated")
-
 });
 
 /* -------------------------------------------- */
 function welcomeMessage() {
   if (game.user.isGM) {
+    // Try to fetch the welcome message from the github repo "welcome-message-ecryme.html"
+    fetch(ECRYME_WELCOME_MESSAGE_URL)
+      .then(response => response.text())
+      .then(html => {
+        //console.log("Fetched welcome message:", html);
         ChatMessage.create({
           user: game.user.id,
           whisper: [game.user.id],
-      content: `<div id="welcome-message-ecryme"><span class="rdd-roll-part">
-      <strong>Bienvenu dans Ecryme !</strong>` });
+          content: html
+        });
+      })
+      .catch(error => {
+        console.error("Error fetching welcome message:", error);
+        ChatMessage.create({
+          user: game.user.id,
+          whisper: [game.user.id],
+          content: "<b>Bienvenue dans Ecryme RPG !</b><br>Visitez le site officiel pour plus d'informations."
+        });
+      });
   }
 }
 
@@ -91,6 +130,7 @@ async function importDefaultScene() {
     await game.scenes.documentClass.create(newDocuments);
     game.scenes.find(i => i.name == "Landing page 1").activate();
   }
+
 }
 
 /* -------------------------------------------- */
@@ -98,15 +138,12 @@ async function importDefaultScene() {
 /* -------------------------------------------- */
 Hooks.once("ready", function () {
 
-  // Load trranslations
-  Babele.get().setSystemTranslationsDir("translated")
-
   // User warning
   if (!game.user.isGM && game.user.character == undefined) {
     ui.notifications.info("Attention ! Aucun personnage relié au joueur !");
     ChatMessage.create({
       content: "<b>WARNING</b> Le joueur  " + game.user.name + " n'est pas relié à un personnage !",
-      user: game.user._id
+      user: game.user.id
     });
   }
 
@@ -124,6 +161,11 @@ Hooks.once("ready", function () {
 
 })
 
+/* -------------------------------------------- */
+Hooks.once("babele.init", (babele) => {
+  console.log("Initializing Babele translations")
+  babele.setSystemTranslationsDir("translated");
+});
 
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
@@ -132,10 +174,9 @@ Hooks.on("chatMessage", (html, content, msg) => {
   if (content[0] == '/') {
     let regExp = /(\S+)/g;
     let commands = content.match(regExp);
-    if (game.system.ecryme.commands.processChatCommand(commands, content, msg)) {
+    if (game.ecryme.commands.processChatCommand(commands, content, msg)) {
       return false;
     }
   }
   return true;
 });
-

modules/items/ecryme-item-sheet.js

@@ -4,32 +4,19 @@ import { EcrymeUtility } from "../common/ecryme-utility.js";
  * Extend the basic ItemSheet with some very simple modifications
  * @extends {ItemSheet}
  */
-export class EcrymeItemSheet extends ItemSheet {
+export class EcrymeItemSheet extends foundry.appv1.sheets.ItemSheet {
 
   /** @override */
   static get defaultOptions() {
-    return foundry.utils.mergeObject(super.defaultOptions, {
+    return {
+      ...super.defaultOptions,
       classes: ["fvtt-ecryme", "sheet", "item"],
       template: "systems/fvtt-ecryme/templates/item-sheet.hbs",
       dragDrop: [{ dragSelector: null, dropSelector: null }],
       width: 620,
       height: 580,
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }]
-    });
-  }
-
-  /* -------------------------------------------- */
-  _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
+    };
   }
 
   /* -------------------------------------------- */
@@ -56,13 +43,13 @@ export class EcrymeItemSheet extends ItemSheet {
       name: this.object.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
-      system: foundry.utils.duplicate(this.object.system),
-      config: foundry.utils.duplicate(game.system.ecryme.config),
+      system: foundry.utils.deepClone(this.object.system),
+      config: foundry.utils.deepClone(game.ecryme.config),
       limited: this.object.limited,
       options: this.options,
       owner: this.document.isOwner,
-      description: await TextEditor.enrichHTML(this.object.system.description, { async: true }),
-      notes: await TextEditor.enrichHTML(this.object.system.notes, { async: true }),
+      description: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.description, { async: true }),
+      notes: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.notes, { async: true }),
       isGM: game.user.isGM
     }
 
@@ -89,7 +76,7 @@ export class EcrymeItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   postItem() {
-    let chatData = foundry.utils.duplicate(this.item)
+    let chatData = foundry.utils.deepClone(this.item)
     if (this.actor) {
       chatData.actor = { id: this.actor.id };
     }
@@ -104,7 +91,7 @@ export class EcrymeItemSheet extends ItemSheet {
         payload: chatData,
       });
 
-    renderTemplate('systems/Ecryme/templates/post-item.html', chatData).then(html => {
+    foundry.applications.handlebars.renderTemplate('systems/fvtt-ecryme/templates/post-item.html', chatData).then(html => {
       let chatOptions = EcrymeUtility.chatDataSetup(html);
       ChatMessage.create(chatOptions)
     });
@@ -154,7 +141,7 @@ export class EcrymeItemSheet extends ItemSheet {
     // Update Inventory Item
     html.find('.item-edit').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
-      const item = this.object.options.actor.getOwnedItem(li.data("item-id"));
+      const item = this.actor?.items.get(li.data("item-id"));
       item.sheet.render(true);
     });
 

modules/items/sheets/_module.js

@@ -0,0 +1,6 @@
+export { default as EcrymeBaseItemSheet } from "./base-item-sheet.js"
+export { default as EcrymeEquipmentSheet } from "./equipment-sheet.js"
+export { default as EcrymeWeaponSheet } from "./weapon-sheet.js"
+export { default as EcrymeTraitSheet } from "./trait-sheet.js"
+export { default as EcrymeSpecializationSheet } from "./specialization-sheet.js"
+export { default as EcrymeManeuverSheet } from "./maneuver-sheet.js"

modules/items/sheets/base-item-sheet.js

@@ -0,0 +1,103 @@
+const { HandlebarsApplicationMixin } = foundry.applications.api
+
+/**
+ * Base item sheet for Ecryme using Application V2.
+ * Subclasses must define static PARTS including header, tabs, description, and optionally details.
+ */
+export default class EcrymeBaseItemSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ItemSheetV2) {
+
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["fvtt-ecryme", "item"],
+    position: {
+      width: 520,
+      height: "auto",
+    },
+    form: {
+      submitOnChange: true,
+    },
+    window: {
+      resizable: true,
+    },
+    dragDrop: [{ dragSelector: "[data-drag]", dropSelector: null }],
+    actions: {
+      editImage: EcrymeBaseItemSheet.#onEditImage,
+    },
+  }
+
+  /** Active tab group tracking */
+  tabGroups = {
+    primary: "description",
+  }
+
+  /**
+   * Build the tabs definition, adding a "details" tab only if the subclass has a "details" PART.
+   * @returns {Record<string, object>}
+   */
+  _getTabs() {
+    const tabs = {
+      description: { id: "description", group: "primary", label: "ECRY.ui.description" },
+    }
+    if (this.constructor.PARTS?.details) {
+      tabs.details = { id: "details", group: "primary", label: "ECRY.ui.details" }
+    }
+    for (const tab of Object.values(tabs)) {
+      tab.active = this.tabGroups[tab.group] === tab.id
+      tab.cssClass = tab.active ? "active" : ""
+    }
+    return tabs
+  }
+
+  /** @override */
+  async _prepareContext() {
+    const context = {
+      fields: this.document.schema.fields,
+      systemFields: this.document.system.schema.fields,
+      item: this.document,
+      system: this.document.system,
+      source: this.document.toObject(),
+      config: game.ecryme.config,
+      isEditable: this.isEditable,
+      tabs: this._getTabs(),
+    }
+    return context
+  }
+
+  /** @override */
+  async _preparePartContext(partId, context) {
+    context = await super._preparePartContext(partId, context)
+    if (partId === "description") {
+      context.tab = context.tabs.description
+      context.enrichedDescription = await foundry.applications.ux.TextEditor.implementation.enrichHTML(
+        this.document.system.description, { async: true }
+      )
+    }
+    return context
+  }
+
+  _canDragStart(selector) { return this.isEditable }
+  _canDragDrop(selector) { return this.isEditable && this.document.isOwner }
+  _onDragStart(event) {}
+  _onDragOver(event) {}
+  async _onDrop(event) {}
+  // #endregion
+
+  // #region Actions
+  static async #onEditImage(event, target) {
+    const attr = target.dataset.edit
+    const current = foundry.utils.getProperty(this.document, attr)
+    const { img } = this.document.constructor.getDefaultArtwork?.(this.document.toObject()) ?? {}
+    const fp = new FilePicker({
+      current,
+      type: "image",
+      redirectToRoot: img ? [img] : [],
+      callback: (path) => {
+        this.document.update({ [attr]: path })
+      },
+      top: this.position.top + 40,
+      left: this.position.left + 10,
+    })
+    return fp.browse()
+  }
+  // #endregion
+}

modules/items/sheets/equipment-sheet.js

@@ -0,0 +1,24 @@
+import EcrymeBaseItemSheet from "./base-item-sheet.js"
+
+export default class EcrymeEquipmentSheet extends EcrymeBaseItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["equipment"],
+    position: { width: 520 },
+  }
+
+  /** @override */
+  static PARTS = {
+    header:      { template: "systems/fvtt-ecryme/templates/items/partials/item-header.hbs" },
+    tabs:        { template: "templates/generic/tab-navigation.hbs" },
+    description: { template: "systems/fvtt-ecryme/templates/items/partials/item-description.hbs" },
+    details:     { template: "systems/fvtt-ecryme/templates/items/item-equipment-details.hbs" },
+  }
+
+  /** @override */
+  async _preparePartContext(partId, context) {
+    context = await super._preparePartContext(partId, context)
+    if (partId === "details") context.tab = context.tabs.details
+    return context
+  }
+}

modules/items/sheets/maneuver-sheet.js

@@ -0,0 +1,24 @@
+import EcrymeBaseItemSheet from "./base-item-sheet.js"
+
+export default class EcrymeManeuverSheet extends EcrymeBaseItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["maneuver"],
+    position: { width: 520 },
+  }
+
+  /** @override */
+  static PARTS = {
+    header:      { template: "systems/fvtt-ecryme/templates/items/partials/item-header.hbs" },
+    tabs:        { template: "templates/generic/tab-navigation.hbs" },
+    description: { template: "systems/fvtt-ecryme/templates/items/partials/item-description.hbs" },
+    details:     { template: "systems/fvtt-ecryme/templates/items/item-maneuver-details.hbs" },
+  }
+
+  /** @override */
+  async _preparePartContext(partId, context) {
+    context = await super._preparePartContext(partId, context)
+    if (partId === "details") context.tab = context.tabs.details
+    return context
+  }
+}

modules/items/sheets/specialization-sheet.js

@@ -0,0 +1,24 @@
+import EcrymeBaseItemSheet from "./base-item-sheet.js"
+
+export default class EcrymeSpecializationSheet extends EcrymeBaseItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["specialization"],
+    position: { width: 520 },
+  }
+
+  /** @override */
+  static PARTS = {
+    header:      { template: "systems/fvtt-ecryme/templates/items/partials/item-header.hbs" },
+    tabs:        { template: "templates/generic/tab-navigation.hbs" },
+    description: { template: "systems/fvtt-ecryme/templates/items/partials/item-description.hbs" },
+    details:     { template: "systems/fvtt-ecryme/templates/items/item-specialization-details.hbs" },
+  }
+
+  /** @override */
+  async _preparePartContext(partId, context) {
+    context = await super._preparePartContext(partId, context)
+    if (partId === "details") context.tab = context.tabs.details
+    return context
+  }
+}

modules/items/sheets/trait-sheet.js

@@ -0,0 +1,24 @@
+import EcrymeBaseItemSheet from "./base-item-sheet.js"
+
+export default class EcrymeTraitSheet extends EcrymeBaseItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["trait"],
+    position: { width: 520 },
+  }
+
+  /** @override */
+  static PARTS = {
+    header:      { template: "systems/fvtt-ecryme/templates/items/partials/item-header.hbs" },
+    tabs:        { template: "templates/generic/tab-navigation.hbs" },
+    description: { template: "systems/fvtt-ecryme/templates/items/partials/item-description.hbs" },
+    details:     { template: "systems/fvtt-ecryme/templates/items/item-trait-details.hbs" },
+  }
+
+  /** @override */
+  async _preparePartContext(partId, context) {
+    context = await super._preparePartContext(partId, context)
+    if (partId === "details") context.tab = context.tabs.details
+    return context
+  }
+}

modules/items/sheets/weapon-sheet.js

@@ -0,0 +1,24 @@
+import EcrymeBaseItemSheet from "./base-item-sheet.js"
+
+export default class EcrymeWeaponSheet extends EcrymeBaseItemSheet {
+  /** @override */
+  static DEFAULT_OPTIONS = {
+    classes: ["weapon"],
+    position: { width: 540 },
+  }
+
+  /** @override */
+  static PARTS = {
+    header:      { template: "systems/fvtt-ecryme/templates/items/partials/item-header.hbs" },
+    tabs:        { template: "templates/generic/tab-navigation.hbs" },
+    description: { template: "systems/fvtt-ecryme/templates/items/partials/item-description.hbs" },
+    details:     { template: "systems/fvtt-ecryme/templates/items/item-weapon-details.hbs" },
+  }
+
+  /** @override */
+  async _preparePartContext(partId, context) {
+    context = await super._preparePartContext(partId, context)
+    if (partId === "details") context.tab = context.tabs.details
+    return context
+  }
+}

modules/models/.gitkeep

@@ -0,0 +1 @@
+# This file ensures the models directory is tracked by git

modules/models/README.md

@@ -0,0 +1,85 @@
+# DataModels Ecryme
+
+## Vue d'ensemble
+
+Ce dossier contient les DataModels pour le système Ecryme. Les DataModels sont la méthode moderne de Foundry VTT (v10+) pour définir les structures de données des acteurs et des items.
+
+## Migration depuis template.json
+
+Le système Ecryme a été migré de l'ancien système `template.json` vers les DataModels. Le fichier `template.json` est conservé pour référence mais est maintenant marqué comme deprecated.
+
+## Structure des fichiers
+
+### Modèles d'Items
+
+- **equipment.js** - Équipements génériques
+- **weapon.js** - Armes (mêlée et distance)
+- **trait.js** - Traits de personnage
+- **specialization.js** - Spécialisations de compétences
+- **maneuver.js** - Manœuvres de combat
+
+### Modèles d'Acteurs
+
+- **pc.js** - Personnages joueurs (PC)
+- **npc.js** - Personnages non-joueurs (NPC)
+- **annency.js** - Annency (acteurs spéciaux)
+
+### Fichier d'index
+
+- **_module.js** - Centralise tous les exports des DataModels
+
+## Utilisation
+
+Les DataModels sont automatiquement enregistrés dans `CONFIG.Actor.dataModels` et `CONFIG.Item.dataModels` lors de l'initialisation du système dans `ecryme-main.js`.
+
+### Accès aux données
+
+Dans les acteurs et items, les données du système sont accessibles via `actor.system` ou `item.system` :
+
+```javascript
+// Exemple avec un PC
+const athletics = actor.system.skills.physical.skilllist.athletics.value;
+
+// Exemple avec une arme
+const weaponType = item.system.weapontype;
+```
+
+## Avantages des DataModels
+
+1. **Validation automatique** - Les types de champs sont vérifiés automatiquement
+2. **Valeurs par défaut** - Chaque champ a une valeur initiale définie
+3. **Type safety** - Meilleure autocomplete dans les IDEs
+4. **Performance** - Optimisation interne de Foundry VTT
+5. **Maintenance** - Code plus propre et organisé
+
+## Compatibilité
+
+Les DataModels sont rétrocompatibles avec les données existantes. Les acteurs et items créés avec l'ancien système `template.json` seront automatiquement migrés vers les nouveaux DataModels lors de leur chargement.
+
+## Développement
+
+Pour ajouter un nouveau type d'acteur ou d'item :
+
+1. Créer un nouveau fichier DataModel dans ce dossier
+2. Définir le schema avec `static defineSchema()`
+3. Exporter le modèle dans `_module.js`
+4. Enregistrer le modèle dans `ecryme-main.js` (CONFIG.Actor.dataModels ou CONFIG.Item.dataModels)
+
+### Exemple minimal
+
+```javascript
+export default class MyNewItemDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      value: new fields.NumberField({ initial: 0, integer: true, min: 0 })
+    };
+  }
+}
+```
+
+## Documentation Foundry VTT
+
+Pour plus d'informations sur les DataModels :
+https://foundryvtt.com/article/system-data-models/

modules/models/_module.js

@@ -0,0 +1,16 @@
+/**
+ * Index des DataModels pour Ecryme
+ * Ce fichier centralise tous les exports des modèles de données
+ */
+
+// Modèles d'items (uniquement les types définis dans template.json types array)
+export { default as EcrymeEquipmentDataModel } from './equipment.js';
+export { default as EcrymeWeaponDataModel } from './weapon.js';
+export { default as EcrymeTraitDataModel } from './trait.js';
+export { default as EcrymeSpecializationDataModel } from './specialization.js';
+export { default as EcrymeManeuverDataModel } from './maneuver.js';
+
+// Modèles d'acteurs
+export { default as EcrymePCDataModel } from './pc.js';
+export { default as EcrymeNPCDataModel } from './npc.js';
+export { default as EcrymeAnnencyDataModel } from './annency.js';

modules/models/annency.js

@@ -0,0 +1,32 @@
+/**
+ * Data model pour les Annency (acteurs)
+ */
+export default class EcrymeAnnencyDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    
+    return {
+      base: new fields.SchemaField({
+        iscollective: new fields.BooleanField({ initial: false }),
+        ismultiple: new fields.BooleanField({ initial: false }),
+        characters: new fields.ArrayField(new fields.StringField(), { initial: [] }),
+        location: new fields.SchemaField({
+          "1": new fields.StringField({ initial: "" }),
+          "2": new fields.StringField({ initial: "" }),
+          "3": new fields.StringField({ initial: "" }),
+          "4": new fields.StringField({ initial: "" }),
+          "5": new fields.StringField({ initial: "" })
+        }),
+        description: new fields.HTMLField({ initial: "" }),
+        enhancements: new fields.StringField({ initial: "" })
+      }),
+      
+      boheme: new fields.SchemaField({
+        name: new fields.StringField({ initial: "" }),
+        ideals: new fields.StringField({ initial: "" }),
+        politic: new fields.StringField({ initial: "" }),
+        description: new fields.HTMLField({ initial: "" })
+      })
+    };
+  }
+}

modules/models/equipment.js

@@ -0,0 +1,15 @@
+/**
+ * Data model pour les équipements
+ */
+export default class EcrymeEquipmentDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      weight: new fields.NumberField({ initial: 0, integer: true, min: 0 }),
+      cost: new fields.NumberField({ initial: 0, integer: true, min: 0 }),
+      costunit: new fields.StringField({ initial: "" }),
+      quantity: new fields.NumberField({ initial: 1, integer: true, min: 0 })
+    };
+  }
+}

modules/models/maneuver.js

@@ -0,0 +1,11 @@
+/**
+ * Data model pour les manœuvres
+ */
+export default class EcrymeManeuverDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" })
+    };
+  }
+}

modules/models/npc.js

@@ -0,0 +1,9 @@
+/**
+ * Data model pour les PNJs (NPC)
+ * Utilise la même structure que les PC
+ */
+import EcrymePCDataModel from './pc.js';
+
+export default class EcrymeNPCDataModel extends EcrymePCDataModel {
+  // Les NPCs utilisent exactement la même structure que les PCs
+}

modules/models/pc.js

@@ -0,0 +1,129 @@
+/**
+ * Data model pour les personnages joueurs (PC)
+ */
+export default class EcrymePCDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    
+    // Template biodata
+    const biodataSchema = {
+      age: new fields.StringField({ initial: "" }),
+      size: new fields.StringField({ initial: "" }),
+      lieunaissance: new fields.StringField({ initial: "" }),
+      nationalite: new fields.StringField({ initial: "" }),
+      profession: new fields.StringField({ initial: "" }),
+      residence: new fields.StringField({ initial: "" }),
+      milieusocial: new fields.StringField({ initial: "" }),
+      poids: new fields.StringField({ initial: "" }),
+      cheveux: new fields.StringField({ initial: "" }),
+      sexe: new fields.StringField({ initial: "" }),
+      yeux: new fields.StringField({ initial: "" }),
+      enfance: new fields.StringField({ initial: "" }),
+      description: new fields.HTMLField({ initial: "" }),
+      gmnotes: new fields.HTMLField({ initial: "" })
+    };
+
+    // Helper function to create a skill schema (creates new instances each time)
+    const createSkillSchema = (keyValue, nameValue, maxValue = 0) => ({
+      key: new fields.StringField({ initial: keyValue }),
+      name: new fields.StringField({ initial: nameValue }),
+      value: new fields.NumberField({ initial: 0, integer: true, min: 0 }),
+      max: new fields.NumberField({ initial: maxValue, integer: true, min: 0 })
+    });
+
+    // Skills categories
+    const physicalSkills = {
+      athletics: new fields.SchemaField(createSkillSchema("athletics", "ECRY.ui.athletics")),
+      driving: new fields.SchemaField(createSkillSchema("driving", "ECRY.ui.driving")),
+      fencing: new fields.SchemaField(createSkillSchema("fencing", "ECRY.ui.fencing")),
+      brawling: new fields.SchemaField(createSkillSchema("brawling", "ECRY.ui.brawling")),
+      shooting: new fields.SchemaField(createSkillSchema("shooting", "ECRY.ui.shooting"))
+    };
+
+    const mentalSkills = {
+      anthropomecanology: new fields.SchemaField(createSkillSchema("anthropomecanology", "ECRY.ui.anthropomecanology")),
+      ecrymology: new fields.SchemaField(createSkillSchema("ecrymology", "ECRY.ui.ecrymology")),
+      traumatology: new fields.SchemaField(createSkillSchema("traumatology", "ECRY.ui.traumatology")),
+      traversology: new fields.SchemaField(createSkillSchema("traversology", "ECRY.ui.traversology")),
+      urbatechnology: new fields.SchemaField(createSkillSchema("urbatechnology", "ECRY.ui.urbatechnology"))
+    };
+
+    const socialSkills = {
+      quibbling: new fields.SchemaField(createSkillSchema("quibbling", "ECRY.ui.quibbling")),
+      creativity: new fields.SchemaField(createSkillSchema("creativity", "ECRY.ui.creativity")),
+      loquacity: new fields.SchemaField(createSkillSchema("loquacity", "ECRY.ui.loquacity")),
+      guile: new fields.SchemaField(createSkillSchema("guile", "ECRY.ui.guile")),
+      performance: new fields.SchemaField(createSkillSchema("performance", "ECRY.ui.performance"))
+    };
+
+    // Helper function to create a cephaly skill schema
+    const createCephalySkillSchema = (nameValue) => ({
+      name: new fields.StringField({ initial: nameValue }),
+      value: new fields.NumberField({ initial: 0, integer: true, min: 0 }),
+      max: new fields.NumberField({ initial: 0, integer: true })
+    });
+
+    // Cephaly skills
+    const cephalySkills = {
+      elegy: new fields.SchemaField(createCephalySkillSchema("ECRY.ui.elegy")),
+      entelechy: new fields.SchemaField(createCephalySkillSchema("ECRY.ui.entelechy")),
+      mekany: new fields.SchemaField(createCephalySkillSchema("ECRY.ui.mekany")),
+      psyche: new fields.SchemaField(createCephalySkillSchema("ECRY.ui.psyche")),
+      scoria: new fields.SchemaField(createCephalySkillSchema("ECRY.ui.scoria"))
+    };
+
+    // Helper function to create an impact schema
+    const createImpactSchema = () => ({
+      superficial: new fields.NumberField({ initial: 0, integer: true, min: 0 }),
+      light: new fields.NumberField({ initial: 0, integer: true, min: 0 }),
+      serious: new fields.NumberField({ initial: 0, integer: true, min: 0 }),
+      major: new fields.NumberField({ initial: 0, integer: true, min: 0 })
+    });
+
+    return {
+      // Biodata
+      biodata: new fields.SchemaField(biodataSchema),
+      
+      // Core data
+      subactors: new fields.ArrayField(new fields.StringField(), { initial: [] }),
+      equipmentfree: new fields.StringField({ initial: "" }),
+      
+      // Skills
+      skills: new fields.SchemaField({
+        physical: new fields.SchemaField({
+          name: new fields.StringField({ initial: "ECRY.ui.physical" }),
+          pnjvalue: new fields.NumberField({ initial: 0, integer: true }),
+          skilllist: new fields.SchemaField(physicalSkills)
+        }),
+        mental: new fields.SchemaField({
+          name: new fields.StringField({ initial: "ECRY.ui.mental" }),
+          pnjvalue: new fields.NumberField({ initial: 0, integer: true }),
+          skilllist: new fields.SchemaField(mentalSkills)
+        }),
+        social: new fields.SchemaField({
+          name: new fields.StringField({ initial: "ECRY.ui.social" }),
+          pnjvalue: new fields.NumberField({ initial: 0, integer: true }),
+          skilllist: new fields.SchemaField(socialSkills)
+        })
+      }),
+      
+      // Impacts
+      impacts: new fields.SchemaField({
+        physical: new fields.SchemaField(createImpactSchema()),
+        mental: new fields.SchemaField(createImpactSchema()),
+        social: new fields.SchemaField(createImpactSchema())
+      }),
+      
+      // Cephaly
+      cephaly: new fields.SchemaField({
+        name: new fields.StringField({ initial: "ECRY.ui.cephaly" }),
+        skilllist: new fields.SchemaField(cephalySkills)
+      }),
+      
+      // Internals
+      internals: new fields.SchemaField({
+        confrontbonus: new fields.NumberField({ initial: 0, integer: true })
+      })
+    };
+  }
+}

modules/models/specialization.js

@@ -0,0 +1,13 @@
+/**
+ * Data model pour les spécialisations
+ */
+export default class EcrymeSpecializationDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      bonus: new fields.NumberField({ initial: 2, integer: true }),
+      skillkey: new fields.StringField({ initial: "" })
+    };
+  }
+}

modules/models/trait.js

@@ -0,0 +1,13 @@
+/**
+ * Data model pour les traits
+ */
+export default class EcrymeTraitDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      traitype: new fields.StringField({ initial: "normal" }),
+      level: new fields.NumberField({ initial: 1, integer: true, min: 1 })
+    };
+  }
+}

modules/models/weapon.js

@@ -0,0 +1,16 @@
+/**
+ * Data model pour les armes
+ */
+export default class EcrymeWeaponDataModel extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const fields = foundry.data.fields;
+    return {
+      description: new fields.HTMLField({ initial: "" }),
+      weight: new fields.NumberField({ initial: 0, integer: true, min: 0 }),
+      cost: new fields.NumberField({ initial: 0, integer: true, min: 0 }),
+      costunit: new fields.StringField({ initial: "" }),
+      weapontype: new fields.StringField({ initial: "melee", choices: { melee: "Mêlée", ranged: "Distance" } }),
+      effect: new fields.NumberField({ initial: 0, integer: true })
+    };
+  }
+}

package.json

@@ -0,0 +1,22 @@
+{
+  "name": "fvtt-ecryme",
+  "private": true,
+  "version": "1.0.0",
+  "description": "Ecryme RPG system for Foundry Virtual TableTop",
+  "author": "LeRatierBretonnien",
+  "license": "CC-BY-NC-SA-4.0",
+  "main": "gulpfile.js",
+  "devDependencies": {
+    "gulp": "^5.0.0",
+    "gulp-less": "^5.0.0",
+    "less": "^4.1.3"
+  },
+  "scripts": {
+    "build": "gulp css",
+    "watch": "gulp"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://www.uberwald.me/gitea/uberwald/fvtt-ecryme.git"
+  }
+}

packs/equipment/CURRENT

@@ -1 +1 @@
-MANIFEST-000176
+MANIFEST-000403

packs/equipment/LOG

@@ -1,7 +1,7 @@
-2025/03/11-22:28:43.689446 7f24c57fa6c0 Recovering log #174
-2025/03/11-22:28:43.742748 7f24c57fa6c0 Delete type=3 #172
-2025/03/11-22:28:43.742876 7f24c57fa6c0 Delete type=0 #174
-2025/03/11-22:29:05.490854 7f24c4bff6c0 Level-0 table #179: started
-2025/03/11-22:29:05.490876 7f24c4bff6c0 Level-0 table #179: 0 bytes OK
-2025/03/11-22:29:05.528875 7f24c4bff6c0 Delete type=0 #177
-2025/03/11-22:29:05.604302 7f24c4bff6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end)
+2026/07/24-08:30:57.764367 7fb397fff6c0 Recovering log #401
+2026/07/24-08:30:57.820757 7fb397fff6c0 Delete type=3 #399
+2026/07/24-08:30:57.820848 7fb397fff6c0 Delete type=0 #401
+2026/07/24-08:59:46.956225 7fb394b4f6c0 Level-0 table #406: started
+2026/07/24-08:59:46.956258 7fb394b4f6c0 Level-0 table #406: 0 bytes OK
+2026/07/24-08:59:46.963004 7fb394b4f6c0 Delete type=0 #404
+2026/07/24-08:59:46.977171 7fb394b4f6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end)

packs/equipment/LOG.old

@@ -1,7 +1,7 @@
-2025/03/11-22:17:42.207103 7f24c5ffb6c0 Recovering log #169
-2025/03/11-22:17:42.229307 7f24c5ffb6c0 Delete type=3 #167
-2025/03/11-22:17:42.229364 7f24c5ffb6c0 Delete type=0 #169
-2025/03/11-22:28:37.828063 7f24c4bff6c0 Level-0 table #175: started
-2025/03/11-22:28:37.828090 7f24c4bff6c0 Level-0 table #175: 0 bytes OK
-2025/03/11-22:28:37.835412 7f24c4bff6c0 Delete type=0 #173
-2025/03/11-22:28:37.855865 7f24c4bff6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end)
+2026/07/23-23:29:38.540622 7fb3977fe6c0 Recovering log #397
+2026/07/23-23:29:38.552087 7fb3977fe6c0 Delete type=3 #395
+2026/07/23-23:29:38.552145 7fb3977fe6c0 Delete type=0 #397
+2026/07/24-08:14:15.212953 7fb394b4f6c0 Level-0 table #402: started
+2026/07/24-08:14:15.212989 7fb394b4f6c0 Level-0 table #402: 0 bytes OK
+2026/07/24-08:14:15.263841 7fb394b4f6c0 Delete type=0 #400
+2026/07/24-08:14:15.341416 7fb394b4f6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end)

packs/help/CURRENT

@@ -1 +1 @@
-MANIFEST-000113
+MANIFEST-000336

packs/help/LOG

@@ -1,8 +1,8 @@
-2025/03/11-22:28:43.904749 7f24c6ffd6c0 Recovering log #111
-2025/03/11-22:28:43.971386 7f24c6ffd6c0 Delete type=3 #109
-2025/03/11-22:28:43.971494 7f24c6ffd6c0 Delete type=0 #111
-2025/03/11-22:29:05.641249 7f24c4bff6c0 Level-0 table #116: started
-2025/03/11-22:29:05.641276 7f24c4bff6c0 Level-0 table #116: 0 bytes OK
-2025/03/11-22:29:05.674923 7f24c4bff6c0 Delete type=0 #114
-2025/03/11-22:29:05.723243 7f24c4bff6c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
-2025/03/11-22:29:05.762798 7f24c4bff6c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
+2026/07/24-08:30:58.009658 7fb396ffd6c0 Recovering log #334
+2026/07/24-08:30:58.067952 7fb396ffd6c0 Delete type=3 #332
+2026/07/24-08:30:58.068041 7fb396ffd6c0 Delete type=0 #334
+2026/07/24-08:59:46.969755 7fb394b4f6c0 Level-0 table #339: started
+2026/07/24-08:59:46.969790 7fb394b4f6c0 Level-0 table #339: 0 bytes OK
+2026/07/24-08:59:46.976981 7fb394b4f6c0 Delete type=0 #337
+2026/07/24-08:59:46.977429 7fb394b4f6c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
+2026/07/24-08:59:46.990444 7fb394b4f6c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)

packs/help/LOG.old

@@ -1,8 +1,8 @@
-2025/03/11-22:17:42.313432 7f24c57fa6c0 Recovering log #106
-2025/03/11-22:17:42.340002 7f24c57fa6c0 Delete type=3 #104
-2025/03/11-22:17:42.340070 7f24c57fa6c0 Delete type=0 #106
-2025/03/11-22:28:37.842072 7f24c4bff6c0 Level-0 table #112: started
-2025/03/11-22:28:37.842115 7f24c4bff6c0 Level-0 table #112: 0 bytes OK
-2025/03/11-22:28:37.848681 7f24c4bff6c0 Delete type=0 #110
-2025/03/11-22:28:37.855911 7f24c4bff6c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
-2025/03/11-22:28:37.855943 7f24c4bff6c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
+2026/07/23-23:29:38.605125 7fb397fff6c0 Recovering log #330
+2026/07/23-23:29:38.614967 7fb397fff6c0 Delete type=3 #328
+2026/07/23-23:29:38.615053 7fb397fff6c0 Delete type=0 #330
+2026/07/24-08:14:15.385470 7fb394b4f6c0 Level-0 table #335: started
+2026/07/24-08:14:15.385508 7fb394b4f6c0 Level-0 table #335: 0 bytes OK
+2026/07/24-08:14:15.417431 7fb394b4f6c0 Delete type=0 #333
+2026/07/24-08:14:15.479154 7fb394b4f6c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
+2026/07/24-08:14:15.542162 7fb394b4f6c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)

packs/maneuvers/CURRENT

@@ -1 +1 @@
-MANIFEST-000176
+MANIFEST-000401

packs/maneuvers/LOG

@@ -1,7 +1,7 @@
-2025/03/11-22:28:43.852356 7f24c67fc6c0 Recovering log #174
-2025/03/11-22:28:43.902310 7f24c67fc6c0 Delete type=3 #172
-2025/03/11-22:28:43.902433 7f24c67fc6c0 Delete type=0 #174
-2025/03/11-22:29:05.604411 7f24c4bff6c0 Level-0 table #179: started
-2025/03/11-22:29:05.604444 7f24c4bff6c0 Level-0 table #179: 0 bytes OK
-2025/03/11-22:29:05.641128 7f24c4bff6c0 Delete type=0 #177
-2025/03/11-22:29:05.723220 7f24c4bff6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end)
+2026/07/24-08:30:57.946392 7fb3977fe6c0 Recovering log #399
+2026/07/24-08:30:58.006024 7fb3977fe6c0 Delete type=3 #397
+2026/07/24-08:30:58.006152 7fb3977fe6c0 Delete type=0 #399
+2026/07/24-08:59:46.984189 7fb394b4f6c0 Level-0 table #404: started
+2026/07/24-08:59:46.984218 7fb394b4f6c0 Level-0 table #404: 0 bytes OK
+2026/07/24-08:59:46.990285 7fb394b4f6c0 Delete type=0 #402
+2026/07/24-08:59:47.001933 7fb394b4f6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end)

packs/maneuvers/LOG.old

@@ -1,7 +1,7 @@
-2025/03/11-22:17:42.287558 7f24c6ffd6c0 Recovering log #169
-2025/03/11-22:17:42.309970 7f24c6ffd6c0 Delete type=3 #167
-2025/03/11-22:17:42.310079 7f24c6ffd6c0 Delete type=0 #169
-2025/03/11-22:28:37.821422 7f24c4bff6c0 Level-0 table #175: started
-2025/03/11-22:28:37.821461 7f24c4bff6c0 Level-0 table #175: 0 bytes OK
-2025/03/11-22:28:37.827638 7f24c4bff6c0 Delete type=0 #173
-2025/03/11-22:28:37.827871 7f24c4bff6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end)
+2026/07/23-23:29:38.590323 7fb3977fe6c0 Recovering log #395
+2026/07/23-23:29:38.602055 7fb3977fe6c0 Delete type=3 #393
+2026/07/23-23:29:38.602139 7fb3977fe6c0 Delete type=0 #395
+2026/07/24-08:14:15.341819 7fb394b4f6c0 Level-0 table #400: started
+2026/07/24-08:14:15.341876 7fb394b4f6c0 Level-0 table #400: 0 bytes OK
+2026/07/24-08:14:15.385247 7fb394b4f6c0 Delete type=0 #398
+2026/07/24-08:14:15.479122 7fb394b4f6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end)

packs/scenes/CURRENT

@@ -1 +1 @@
-MANIFEST-000060
+MANIFEST-000289

packs/scenes/LOG

@@ -1,8 +1,8 @@
-2025/03/11-22:28:43.794986 7f24c6ffd6c0 Recovering log #58
-2025/03/11-22:28:43.848806 7f24c6ffd6c0 Delete type=3 #56
-2025/03/11-22:28:43.848927 7f24c6ffd6c0 Delete type=0 #58
-2025/03/11-22:29:05.569282 7f24c4bff6c0 Level-0 table #63: started
-2025/03/11-22:29:05.569313 7f24c4bff6c0 Level-0 table #63: 0 bytes OK
-2025/03/11-22:29:05.604065 7f24c4bff6c0 Delete type=0 #61
-2025/03/11-22:29:05.604324 7f24c4bff6c0 Manual compaction at level-0 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end)
-2025/03/11-22:29:05.675098 7f24c4bff6c0 Manual compaction at level-1 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end)
+2026/07/24-08:30:57.885965 7fb397fff6c0 Recovering log #287
+2026/07/24-08:30:57.939362 7fb397fff6c0 Delete type=3 #285
+2026/07/24-08:30:57.939470 7fb397fff6c0 Delete type=0 #287
+2026/07/24-08:59:46.948977 7fb394b4f6c0 Level-0 table #292: started
+2026/07/24-08:59:46.949053 7fb394b4f6c0 Level-0 table #292: 0 bytes OK
+2026/07/24-08:59:46.956075 7fb394b4f6c0 Delete type=0 #290
+2026/07/24-08:59:46.977151 7fb394b4f6c0 Manual compaction at level-0 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 0 : 0; will stop at (end)
+2026/07/24-08:59:46.977404 7fb394b4f6c0 Manual compaction at level-1 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 0 : 0; will stop at (end)

packs/scenes/LOG.old

@@ -1,8 +1,8 @@
-2025/03/11-22:17:42.261222 7f24c57fa6c0 Recovering log #53
-2025/03/11-22:17:42.284333 7f24c57fa6c0 Delete type=3 #51
-2025/03/11-22:17:42.284459 7f24c57fa6c0 Delete type=0 #53
-2025/03/11-22:28:37.807470 7f24c4bff6c0 Level-0 table #59: started
-2025/03/11-22:28:37.807537 7f24c4bff6c0 Level-0 table #59: 0 bytes OK
-2025/03/11-22:28:37.814273 7f24c4bff6c0 Delete type=0 #57
-2025/03/11-22:28:37.827846 7f24c4bff6c0 Manual compaction at level-0 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end)
-2025/03/11-22:28:37.828046 7f24c4bff6c0 Manual compaction at level-1 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end)
+2026/07/23-23:29:38.570468 7fb396ffd6c0 Recovering log #283
+2026/07/23-23:29:38.581351 7fb396ffd6c0 Delete type=3 #281
+2026/07/23-23:29:38.581438 7fb396ffd6c0 Delete type=0 #283
+2026/07/24-08:14:15.298614 7fb394b4f6c0 Level-0 table #288: started
+2026/07/24-08:14:15.298651 7fb394b4f6c0 Level-0 table #288: 0 bytes OK
+2026/07/24-08:14:15.341159 7fb394b4f6c0 Delete type=0 #286
+2026/07/24-08:14:15.341595 7fb394b4f6c0 Manual compaction at level-0 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 0 : 0; will stop at (end)
+2026/07/24-08:14:15.417678 7fb394b4f6c0 Manual compaction at level-1 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 0 : 0; will stop at (end)

packs/specialisation/CURRENT

@@ -1 +1 @@
-MANIFEST-000176
+MANIFEST-000403

packs/specialisation/LOG

@@ -1,7 +1,7 @@
-2025/03/11-22:28:43.632057 7f24c5ffb6c0 Recovering log #174
-2025/03/11-22:28:43.687014 7f24c5ffb6c0 Delete type=3 #172
-2025/03/11-22:28:43.687139 7f24c5ffb6c0 Delete type=0 #174
-2025/03/11-22:29:05.529067 7f24c4bff6c0 Level-0 table #179: started
-2025/03/11-22:29:05.529094 7f24c4bff6c0 Level-0 table #179: 0 bytes OK
-2025/03/11-22:29:05.569107 7f24c4bff6c0 Delete type=0 #177
-2025/03/11-22:29:05.604312 7f24c4bff6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end)
+2026/07/24-08:30:57.704269 7fb3e4fff6c0 Recovering log #401
+2026/07/24-08:30:57.760459 7fb3e4fff6c0 Delete type=3 #399
+2026/07/24-08:30:57.760535 7fb3e4fff6c0 Delete type=0 #401
+2026/07/24-08:59:46.963178 7fb394b4f6c0 Level-0 table #406: started
+2026/07/24-08:59:46.963211 7fb394b4f6c0 Level-0 table #406: 0 bytes OK
+2026/07/24-08:59:46.969620 7fb394b4f6c0 Delete type=0 #404
+2026/07/24-08:59:46.977188 7fb394b4f6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end)

packs/specialisation/LOG.old

@@ -1,7 +1,8 @@
-2025/03/11-22:17:42.183744 7f24c67fc6c0 Recovering log #169
-2025/03/11-22:17:42.204063 7f24c67fc6c0 Delete type=3 #167
-2025/03/11-22:17:42.204124 7f24c67fc6c0 Delete type=0 #169
-2025/03/11-22:28:37.801121 7f24c4bff6c0 Level-0 table #175: started
-2025/03/11-22:28:37.801173 7f24c4bff6c0 Level-0 table #175: 0 bytes OK
-2025/03/11-22:28:37.807280 7f24c4bff6c0 Delete type=0 #173
-2025/03/11-22:28:37.827819 7f24c4bff6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end)
+2026/07/23-23:29:38.526675 7fb397fff6c0 Recovering log #398
+2026/07/23-23:29:38.536758 7fb397fff6c0 Delete type=0 #398
+2026/07/23-23:29:38.536840 7fb397fff6c0 Delete type=3 #397
+2026/07/23-23:29:38.536904 7fb397fff6c0 Delete type=0 #393
+2026/07/24-08:14:15.178686 7fb394b4f6c0 Level-0 table #402: started
+2026/07/24-08:14:15.178752 7fb394b4f6c0 Level-0 table #402: 0 bytes OK
+2026/07/24-08:14:15.212738 7fb394b4f6c0 Delete type=0 #400
+2026/07/24-08:14:15.341395 7fb394b4f6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end)

packs/specializations/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000002

packs/specializations/LOG

@@ -0,0 +1 @@
+2026/05/06-14:41:23.043596 7f0aceffd6c0 Delete type=3 #1

packs/traits/CURRENT

@@ -1 +1 @@
-MANIFEST-000176
+MANIFEST-000403

packs/traits/LOG

@@ -1,7 +1,7 @@
-2025/03/11-22:28:43.745519 7f24c67fc6c0 Recovering log #174
-2025/03/11-22:28:43.792356 7f24c67fc6c0 Delete type=3 #172
-2025/03/11-22:28:43.792465 7f24c67fc6c0 Delete type=0 #174
-2025/03/11-22:29:05.462231 7f24c4bff6c0 Level-0 table #179: started
-2025/03/11-22:29:05.462271 7f24c4bff6c0 Level-0 table #179: 0 bytes OK
-2025/03/11-22:29:05.490724 7f24c4bff6c0 Delete type=0 #177
-2025/03/11-22:29:05.604286 7f24c4bff6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end)
+2026/07/24-08:30:57.824354 7fb3e4fff6c0 Recovering log #401
+2026/07/24-08:30:57.882379 7fb3e4fff6c0 Delete type=3 #399
+2026/07/24-08:30:57.882459 7fb3e4fff6c0 Delete type=0 #401
+2026/07/24-08:59:46.977440 7fb394b4f6c0 Level-0 table #406: started
+2026/07/24-08:59:46.977475 7fb394b4f6c0 Level-0 table #406: 0 bytes OK
+2026/07/24-08:59:46.984032 7fb394b4f6c0 Delete type=0 #404
+2026/07/24-08:59:47.001914 7fb394b4f6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end)

packs/traits/LOG.old

@@ -1,7 +1,7 @@
-2025/03/11-22:17:42.232923 7f24c6ffd6c0 Recovering log #169
-2025/03/11-22:17:42.257730 7f24c6ffd6c0 Delete type=3 #167
-2025/03/11-22:17:42.257832 7f24c6ffd6c0 Delete type=0 #169
-2025/03/11-22:28:37.814417 7f24c4bff6c0 Level-0 table #175: started
-2025/03/11-22:28:37.814450 7f24c4bff6c0 Level-0 table #175: 0 bytes OK
-2025/03/11-22:28:37.821238 7f24c4bff6c0 Delete type=0 #173
-2025/03/11-22:28:37.827860 7f24c4bff6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end)
+2026/07/23-23:29:38.555786 7fb3e4fff6c0 Recovering log #397
+2026/07/23-23:29:38.566404 7fb3e4fff6c0 Delete type=3 #395
+2026/07/23-23:29:38.566494 7fb3e4fff6c0 Delete type=0 #397
+2026/07/24-08:14:15.264074 7fb394b4f6c0 Level-0 table #402: started
+2026/07/24-08:14:15.264110 7fb394b4f6c0 Level-0 table #402: 0 bytes OK
+2026/07/24-08:14:15.298436 7fb394b4f6c0 Delete type=0 #400
+2026/07/24-08:14:15.341433 7fb394b4f6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end)