/exp uniquement sur personnage et messages XP uniquement pour MJ

Fix: draconic optionnel pour Rêve de dragon

See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!284

.gitignore

@@ -1,3 +1,5 @@
 .vscode/settings.json
+.idea
 todo.txt
 todo.md
+/.vscode

RdD.geany

@@ -1,43 +0,0 @@
-[editor]
-line_wrapping=false
-line_break_column=72
-auto_continue_multiline=true
-
-[file_prefs]
-final_new_line=true
-ensure_convert_new_lines=false
-strip_trailing_spaces=false
-replace_tabs=false
-
-[indentation]
-indent_width=2
-indent_type=0
-indent_hard_tab_width=8
-detect_indent=false
-detect_indent_width=false
-indent_mode=2
-
-[project]
-name=RdD
-base_path=/home/morr/work/foundryvtt/foundryvtt-reve-de-dragon
-description=
-file_patterns=
-
-[long line marker]
-long_line_behaviour=1
-long_line_column=72
-
-[files]
-current_page=8
-FILE_NAME_0=9759;JSON;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Ftemplate.json;0;2
-FILE_NAME_1=8120;CSS;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fstyles%2Fsimple.css;0;2
-FILE_NAME_2=19778;Javascript;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fmodule%2Ftmr-utility.js;0;2
-FILE_NAME_3=21106;Javascript;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fmodule%2Factor.js;0;2
-FILE_NAME_4=6228;Javascript;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fmodule%2Factor-sheet.js;0;2
-FILE_NAME_5=20083;HTML;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Ftemplates%2Factor-sheet.html;0;2
-FILE_NAME_6=1312;Javascript;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fmodule%2Frdd-tmr-dialog.js;0;2
-FILE_NAME_7=1767;Javascript;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fmodule%2Frdd-roll-dialog.js;0;2
-FILE_NAME_8=266;None;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fpacks%2Fqueues-de-dragon.db;0;2
-
-[VTE]
-last_dir=/home/sigmar

dev-notes.md

@@ -0,0 +1,61 @@
+# Actor notes
+
+> The Actor#getData default implementation gives you the following for use in sheet rendering:
+
+```
+  actor -> the Actor instance
+  data -> a cloned copy of Actor#data
+  items -> a cloned copy of Actor#data#items
+  effects -> a cloned copy of Actor#data#effects
+```
+
+> if all you need is a safe copy of `Actor#data`, you'll be much better off by simply defining your own function and avoiding all the wasted work that the parent class does which will slow down your sheet
+```js
+getData(options) {
+  return {
+    data: foundry.utils.deepClone(this.object.data)
+  }
+}
+```
+
+who knows, maybe you don't even need to copy your actor data, skip the copy and it's even faster:
+```js
+getData(options) {
+  return {
+    data: this.object.data
+  }
+}
+```
+
+
+Atropos19/02/2021
+There are two recommended ways to create owned items in 0.8.0:
+```js
+await Item.create(itemData, {parent: actor});
+await actor.createEmbeddedDocuments("Item", itemDataArray);
+```
+
+
+You can update an embedded item in one of two ways:
+```js
+//Method 1:
+
+const item = actor.items.get(itemId);
+item.update(data);
+
+//Method 2:
+actor.updateEmbeddedDocuments("Item", [{_id: itemId, ...}]);
+```
+
+
+I noticed adding an ActiveEffect to an actor in code using
+
+```js
+this.createEmbeddedDocuments('ActiveEffect', [effet], options);
+this.applyActiveEffects();
+```
+
+Atropos — Aujourd’hui à 14:42
+Two notes on this:
+1. You don't actually need to call this.applyActiveEffects() because this will happen automatically whenever an effect is created/updated/deleted
+2. If you want to suppress the automatic display of the sheet for the newly created document, you can pass options.renderSheet = false as part of your options object

icons/tmr/gift.svg

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Capa_1"
-   x="0px"
-   y="0px"
-   width="512"
-   height="512"
-   viewBox="0 0 512 512"
-   xml:space="preserve"
-   sodipodi:docname="gift.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"><metadata
-   id="metadata51"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-   id="defs49" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="3840"
-   inkscape:window-height="2066"
-   id="namedview47"
-   showgrid="false"
-   inkscape:zoom="2.415894"
-   inkscape:cx="64"
-   inkscape:cy="163.34211"
-   inkscape:window-x="-11"
-   inkscape:window-y="-11"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="g14"
-   inkscape:document-rotation="0" />
-<g
-   id="g14"
-   transform="matrix(5.7,0,0,5.7,1.6591,1.6521435)">
-	
-<g
-   id="g24-9"
-   transform="matrix(0.1754386,0,0,0.1754386,3.2674006,3.2686582)"
-   style="fill:#ffffff;stroke:none"><path
-     d="m 81.245,212.419 c -9.902,13.127 -19.256,25.526 -8.273,47.079 4.957,9.729 18.132,11.771 28.311,11.771 20.904,0 45.125,-8.057 63.033,-19.182 -2.994,-3.719 -6.111,-8.237 -6.111,-13.949 0,-6.576 4.131,-11.571 7.451,-15.585 1.601,-1.936 3.415,-4.129 3.882,-5.569 0.523,-1.607 0.357,-4.439 0.197,-7.178 -0.299,-5.108 -0.67,-11.466 3.069,-16.605 2.653,-3.644 6.503,-5.517 10.286,-6.759 -3.608,-8.125 -8.398,-16.488 -14.204,-24.48 -14.902,-20.512 -32.983,-33.767 -46.06,-33.767 -2.845,0 -5.39,0.592 -7.78,1.81 -21.868,11.143 -21.404,26.636 -20.912,43.039 0.22,7.359 0.429,14.31 -1.603,20.561 -2.198,6.767 -6.612,12.619 -11.286,18.814 z"
-     id="path2"
-     style="fill:#ffffff;stroke:none" /><path
-     d="m 464.076,203.816 c -7.567,-14.789 -26.952,-17.893 -41.88,-17.893 -9.41,0 -19.295,1.161 -29.221,3.252 1.645,2.602 3.775,5.369 5.992,8.235 10.528,13.614 24.948,32.259 9.778,62.032 -5.735,11.255 -17.472,17.797 -34.132,19.144 4.004,3.046 7.514,6.264 10.369,9.608 7.716,9.035 10.98,18.948 9.44,28.668 -5.153,32.537 -27.667,39.408 -44.107,44.425 -2.622,0.8 -5.172,1.586 -7.547,2.43 17.125,17.508 34.971,27.756 49.438,27.756 4.384,0 8.483,-0.96 12.185,-2.855 32.102,-16.428 31.354,-39.981 30.631,-62.76 -0.318,-10.034 -0.619,-19.512 2.054,-27.791 2.912,-9.018 8.93,-17.024 15.301,-25.501 14.344,-19.083 27.892,-37.108 11.699,-68.75 z"
-     id="path4"
-     style="fill:#ffffff;stroke:none" /><path
-     d="m 270.444,394.702 c 2.878,0.456 5.642,0.687 8.214,0.687 18.176,0 25.863,-11.274 34.001,-23.211 4.148,-6.084 8.066,-11.83 13.384,-15.693 5.755,-4.182 12.766,-6.321 20.188,-8.587 15.727,-4.8 30.581,-9.333 34.364,-33.225 0.893,-5.63 -1.213,-11.479 -6.258,-17.386 -8.141,-9.532 -23.127,-18.049 -39.956,-23.652 -1.862,-0.538 -3.721,-1.116 -5.575,-1.729 -9.632,-2.772 -19.668,-4.561 -29.237,-5.027 0.292,5.036 0.549,11.19 -3.092,16.193 -3.771,5.18 -9.963,6.789 -14.938,8.081 -2.629,0.683 -5.348,1.389 -6.67,2.351 -1.28,0.933 -2.769,3.273 -4.207,5.537 -2.776,4.368 -6.232,9.804 -12.397,11.806 -1.511,0.491 -3.127,0.739 -4.804,0.739 -1.835,0 -3.626,-0.305 -5.359,-0.754 -3.383,17.09 -3.525,36.966 0.635,54.293 2.436,10.148 8.497,27.485 21.707,29.577 z"
-     id="path6"
-     style="fill:#ffffff;stroke:none" /><path
-     d="m 126.439,366.003 c -16.52,-4.826 -39.144,-11.435 -44.37,-44.438 -1.539,-9.719 1.725,-19.632 9.44,-28.667 2.257,-2.643 4.924,-5.206 7.915,-7.669 -19.207,-0.406 -32.657,-7.071 -38.927,-19.376 -14.955,-29.353 -0.779,-48.145 9.572,-61.866 1.457,-1.931 2.882,-3.822 4.177,-5.669 -8.438,-1.537 -16.798,-2.384 -24.81,-2.384 -15.076,0 -34.636,3.13 -42.2,18.042 -16.315,32.161 -1.866,50.776 12.108,68.778 6.156,7.931 11.971,15.422 14.674,23.692 2.944,9.006 2.782,19.021 2.61,29.623 -0.386,23.87 -0.751,46.416 30.949,62.497 3.678,1.866 7.743,2.811 12.085,2.811 15.828,0 35.7,-12.34 54.219,-33.068 -2.312,-0.8 -4.839,-1.546 -7.442,-2.306 z"
-     id="path8"
-     style="fill:#ffffff;stroke:none" /><path
-     d="m 276.172,62.189 c 12.786,0 24.223,5.22 34.962,15.96 9.115,9.115 11.603,22.92 7.36,39.616 9.602,-6.462 19.178,-9.98 27.922,-9.98 5.036,0 9.792,1.123 14.137,3.337 29.352,14.955 28.93,38.491 28.62,55.676 -0.036,2.032 -0.067,4.02 -0.056,5.943 13.727,-6.889 25.322,-15.114 32.853,-23.947 7.611,-8.928 10.762,-17.875 9.364,-26.592 C 425.63,86.594 402.997,80.027 381.11,73.676 371.468,70.879 362.361,68.236 355.314,63.135 347.636,57.578 341.881,49.38 335.789,40.701 324.269,24.291 312.358,7.323 285.965,7.323 c -3.748,0 -7.768,0.339 -11.947,1.009 -20.054,3.212 -28.987,28.625 -32.527,43.488 -1.487,6.242 -2.569,12.945 -3.271,19.898 3.292,-0.724 7.018,-2.048 10.899,-3.439 7.965,-2.855 16.995,-6.09 27.053,-6.09 z"
-     id="path10"
-     style="fill:#ffffff;stroke:none" /><path
-     d="m 80.254,180.726 c 0.028,-2.296 -0.039,-4.745 -0.114,-7.261 -0.516,-17.203 -1.222,-40.762 28.551,-55.932 4.345,-2.214 9.101,-3.336 14.136,-3.336 8.349,0 17.457,3.203 26.621,9.117 -6.331,-19.186 -4.373,-35.058 5.734,-45.165 10.691,-10.692 22.104,-15.89 34.887,-15.89 9.877,0 18.926,3.121 26.909,5.875 1.419,0.49 2.817,0.97 4.191,1.424 -0.685,-4.98 -1.561,-9.809 -2.666,-14.377 -3.594,-14.851 -12.618,-40.235 -32.683,-43.376 -4.124,-0.646 -8.094,-0.973 -11.801,-0.973 -26.95,0 -38.601,17.153 -49.868,33.742 -5.641,8.306 -10.969,16.151 -17.999,21.277 -7.655,5.583 -17.23,8.524 -27.367,11.638 -22.821,7.009 -44.376,13.629 -49.874,48.746 -1.361,8.696 1.798,17.605 9.392,26.48 9.129,10.667 24.272,20.436 41.951,28.011 z"
-     id="path12"
-     style="fill:#ffffff;stroke:none" /><path
-     d="m 328.161,374.443 c -1.295,1.753 -2.6,3.664 -3.935,5.621 -8.438,12.375 -19.993,29.324 -45.568,29.324 -3.304,0 -6.804,-0.289 -10.403,-0.859 -12.671,-2.006 -22.761,-11.63 -29.146,-27.494 -6.21,18.666 -16.992,30 -30.871,32.198 -3.581,0.567 -7.063,0.854 -10.349,0.854 -25.198,0 -36.474,-16.121 -45.533,-29.075 -1.561,-2.232 -3.085,-4.399 -4.611,-6.387 -2.519,4.654 -4.752,9.299 -6.633,13.862 -5.821,14.126 -13.439,39.965 0.946,54.3 11.86,11.818 23.598,17.323 36.938,17.323 11.172,0 21.87,-3.855 32.217,-7.584 9.445,-3.404 18.367,-6.619 27.066,-6.634 9.527,0 18.977,3.24 28.98,6.671 10.371,3.556 21.096,7.234 32.052,7.234 h 0.005 c 13.408,-0.002 25.147,-5.516 36.943,-17.354 14.313,-14.363 6.645,-40.121 0.8,-54.197 -2.432,-5.852 -5.439,-11.836 -8.898,-17.803 z"
-     id="path14"
-     style="fill:#ffffff;stroke:none" /><path
-     d="m 190.069,76.259 c -9.005,0 -16.944,3.746 -24.987,11.789 -9.459,9.458 -4.171,27.047 -0.177,36.69 7.686,18.555 21.693,36.525 36.309,48.605 2.38,-3.296 5.398,-6.483 9.806,-7.914 1.511,-0.491 3.127,-0.739 4.805,-0.739 4.22,0 8.227,1.567 11.763,2.949 2.6,1.016 5.287,2.067 7.057,2.067 1.77,0 4.457,-1.051 7.057,-2.067 3.535,-1.382 7.543,-2.948 11.762,-2.948 1.678,0 3.294,0.249 4.805,0.739 3.715,1.206 6.442,3.662 8.633,6.377 13.957,-12.04 27.143,-29.278 34.512,-47.07 3.994,-9.643 9.282,-27.231 -0.176,-36.69 -8.092,-8.091 -16.055,-11.859 -25.063,-11.859 -7.626,0 -15.102,2.679 -22.331,5.27 -6.931,2.484 -13.477,4.83 -20.049,4.83 -7.115,0 -14.044,-2.39 -21.379,-4.92 -7.286,-2.512 -14.816,-5.109 -22.347,-5.109 z"
-     id="path16"
-     style="fill:#ffffff;stroke:none" /><path
-     d="m 396.271,253.086 c 11.144,-21.87 1.661,-34.13 -8.379,-47.111 -4.504,-5.824 -8.758,-11.324 -10.789,-17.574 -2.199,-6.768 -2.067,-14.096 -1.928,-21.855 0.296,-16.44 0.575,-31.969 -20.978,-42.951 -2.392,-1.218 -4.936,-1.811 -7.781,-1.811 -13.076,0 -31.153,13.253 -46.055,33.763 -7.177,9.878 -12.801,20.322 -16.549,30.183 4.48,1.242 9.45,3.059 12.663,7.474 3.74,5.139 3.368,11.496 3.069,16.604 -0.16,2.739 -0.326,5.571 0.196,7.178 0.467,1.44 2.281,3.633 3.882,5.568 3.319,4.014 7.45,9.008 7.45,15.583 0,3.601 -1.241,6.724 -2.907,9.475 6.998,4.038 14.811,7.587 22.921,10.41 3.011,0.836 5.989,1.759 8.917,2.766 9.424,2.568 18.994,4.068 27.956,4.068 10.181,0.001 23.356,-2.041 28.312,-11.77 z"
-     id="path18"
-     style="fill:#ffffff;stroke:none" /><path
-     d="m 95.897,319.376 c 3.839,24.242 18.717,28.588 34.468,33.189 7.066,2.064 13.742,4.015 19.059,7.877 5.757,4.182 9.957,10.189 14.404,16.547 8.308,11.878 16.155,23.098 34.061,23.098 2.555,0 5.299,-0.229 8.159,-0.683 13.211,-2.092 19.271,-19.429 21.708,-29.577 4.71,-19.62 3.901,-42.504 -0.881,-60.914 -3.359,1.307 -7.109,2.672 -11.051,2.672 -1.678,0 -3.294,-0.249 -4.805,-0.739 -6.165,-2.001 -9.621,-7.438 -12.398,-11.805 -1.439,-2.264 -2.928,-4.605 -4.208,-5.538 -1.322,-0.962 -4.041,-1.668 -6.67,-2.351 -4.976,-1.292 -11.168,-2.9 -14.938,-8.08 -2.434,-3.342 -3.123,-7.199 -3.229,-10.893 -26.569,3.035 -54.982,15.244 -67.422,29.811 -5.043,5.908 -7.149,11.757 -6.257,17.386 z"
-     id="path20"
-     style="fill:#ffffff;stroke:none" /><path
-     d="m 246.796,295.599 c 2.499,0.978 5.084,1.988 6.664,1.988 0.204,0 0.37,-0.019 0.48,-0.055 1.376,-0.447 3.416,-3.657 4.906,-6.001 2.04,-3.21 4.354,-6.849 7.784,-9.346 3.469,-2.525 7.677,-3.618 11.388,-4.583 2.666,-0.692 6.317,-1.641 7.139,-2.768 0.79,-1.086 0.571,-4.821 0.411,-7.548 -0.225,-3.845 -0.48,-8.204 0.856,-12.32 1.292,-3.98 4.011,-7.267 6.41,-10.168 1.889,-2.283 4.238,-5.124 4.238,-6.661 0,-1.536 -2.351,-4.378 -4.238,-6.661 -2.399,-2.9 -5.118,-6.188 -6.41,-10.168 -1.336,-4.115 -1.081,-8.474 -0.856,-12.319 0.16,-2.728 0.379,-6.462 -0.412,-7.549 -0.82,-1.127 -4.471,-2.075 -7.137,-2.768 -3.712,-0.964 -7.918,-2.057 -11.388,-4.583 -3.432,-2.497 -5.745,-6.136 -7.786,-9.347 -1.489,-2.344 -3.529,-5.553 -4.904,-5.999 -0.11,-0.036 -0.276,-0.055 -0.48,-0.055 -1.58,0 -4.165,1.01 -6.665,1.988 -3.63,1.419 -7.745,3.027 -12.153,3.027 -4.408,0 -8.523,-1.609 -12.154,-3.028 -2.5,-0.978 -5.085,-1.988 -6.665,-1.988 -0.204,0 -0.371,0.019 -0.482,0.055 -1.375,0.446 -3.415,3.656 -4.904,5.999 -2.041,3.211 -4.355,6.85 -7.787,9.348 -3.47,2.525 -7.677,3.617 -11.389,4.581 -2.666,0.692 -6.317,1.64 -7.139,2.768 -0.79,1.086 -0.572,4.822 -0.413,7.549 0.225,3.845 0.48,8.203 -0.856,12.319 -1.293,3.98 -4.012,7.267 -6.41,10.167 -1.889,2.284 -4.239,5.126 -4.239,6.662 0,1.537 2.351,4.378 4.239,6.662 2.398,2.9 5.117,6.187 6.41,10.167 1.336,4.115 1.081,8.473 0.856,12.318 -0.159,2.728 -0.377,6.463 0.414,7.55 0.821,1.128 4.472,2.076 7.138,2.768 3.712,0.964 7.918,2.056 11.389,4.581 3.432,2.497 5.745,6.136 7.786,9.347 1.489,2.344 3.53,5.554 4.905,6.001 0.111,0.036 0.277,0.055 0.482,0.055 1.58,0 4.165,-1.011 6.666,-1.988 3.63,-1.419 7.745,-3.028 12.153,-3.028 4.408,0 8.523,1.612 12.153,3.031 z"
-     id="path22"
-     style="fill:#ffffff;stroke:none" /></g></g>
-<g
-   id="g16">
-</g>
-<g
-   id="g18">
-</g>
-<g
-   id="g20">
-</g>
-<g
-   id="g22">
-</g>
-<g
-   id="g24">
-</g>
-<g
-   id="g26">
-</g>
-<g
-   id="g28">
-</g>
-<g
-   id="g30">
-</g>
-<g
-   id="g32">
-</g>
-<g
-   id="g34">
-</g>
-<g
-   id="g36">
-</g>
-<g
-   id="g38">
-</g>
-<g
-   id="g40">
-</g>
-<g
-   id="g42">
-</g>
-<g
-   id="g44">
-</g>
-</svg>

icons/tmr/pelerin.svg

@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="512"
-   height="512"
-   viewBox="0 0 135.46666 135.46667"
-   version="1.1"
-   id="svg878"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
-   sodipodi:docname="pelerin.svg">
-  <defs
-     id="defs872">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath1730">
-      <g
-         inkscape:label="Clip"
-         id="use1732"
-         style="fill:#d38d5f;stroke:#502d16">
-        <g
-           id="g1541"
-           transform="matrix(0.28980934,0,0,0.21909426,120.56466,-12.741092)"
-           style="display:inline;fill:#d38d5f;stroke:#502d16;stroke-width:2.16856">
-          <path
-             sodipodi:nodetypes="cccccc"
-             id="path1535"
-             d="m -174.5565,130.97253 h 15.40856 v 508.4827 l -7.70428,24 -7.70428,-24 z"
-             style="fill:#d38d5f;stroke:#502d16;stroke-width:2.16856" />
-          <path
-             transform="matrix(1.001146,0,0,0.893038,2.193524,15.82179)"
-             style="fill:#d38d5f;stroke:#502d16;stroke-width:2.29344"
-             d="m -145.09735,123.91028 c 0,13.11269 -10.64218,17.6523 -23.75487,17.6523 -13.11269,0 -23.75487,-4.53961 -23.75487,-17.6523 0,-13.11269 10.64218,-23.75487 23.75487,-23.75487 13.11269,0 23.75487,10.64218 23.75487,23.75487 z"
-             id="path1537"
-             sodipodi:nodetypes="csssc" />
-          <path
-             style="fill:#d38d5f;stroke:#502d16;stroke-width:2.16856"
-             d="m -146.94948,221.199 c 0,8.50553 -8.91642,12.68366 -19.90273,12.68366 -10.98631,0 -19.90273,-4.17813 -19.90273,-12.68366 0,-8.50553 8.91642,-9.95873 19.90273,-9.95873 10.98631,0 19.90273,1.4532 19.90273,9.95873 z"
-             id="path1539"
-             sodipodi:nodetypes="csssc" />
-        </g>
-        <g
-           style="display:inline;fill:#d38d5f;stroke:#502d16"
-           id="g1559"
-           transform="matrix(0.20847315,-0.03662954,0.03662954,0.20847315,-0.34176516,-0.20270665)">
-          <g
-             inkscape:label="Fond écu"
-             id="g1543"
-             style="fill:#d38d5f;stroke:#502d16" />
-          <g
-             style="opacity:1;fill:#d38d5f;stroke:#502d16"
-             inkscape:label="Meubles"
-             id="g1553">
-            <g
-               id="g1551"
-               transform="matrix(0.714908,0,0,0.756557,137.7704,128.4719)"
-               style="display:inline;fill:#d38d5f;fill-opacity:1;stroke:#502d16;stroke-width:2.71947;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-              <path
-                 sodipodi:nodetypes="ccccc"
-                 id="path1545"
-                 d="m 160.08787,143.23938 39.92645,57.31251 39.53535,-57.31251 h -40.3837 z"
-                 style="fill:#d38d5f;fill-opacity:1;fill-rule:evenodd;stroke:#502d16;stroke-width:2.71947;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-              <path
-                 sodipodi:nodetypes="ccccccccccccccccccccc"
-                 id="path1547"
-                 d="m 193.20453,145.31745 c -24.41443,20.15923 -49.98749,37.33861 -73.2768,58.5917 -6.37089,11.43876 -4.50952,20.09512 9.2768,25.68955 14.75917,-16.92275 18.76874,-17.90421 41.38418,-46.03566 -22.42258,29.55858 -41.45116,42.84434 -41.29043,46.09816 5.38114,19.66042 0.98803,22.70493 25.28125,31.0625 2.90109,-14.41044 25.62687,-63.19056 32.51802,-70.81345 -6.73696,8.18151 -29.75646,56.59527 -32.58052,71.37595 18.94602,17.92 18.75832,19.45149 44.6875,14.03125 l 0.375,-80.91001 0.375,80.91001 c 21.42445,5.42024 29.31401,4.7897 44.65625,-14.03125 -3.59166,-13.24549 -25.62533,-59.96461 -31.64832,-69.57405 4.75359,7.7904 26.43091,52.99484 31.61707,69.01155 18.88754,-8.35757 21.70202,-8.69924 25.28125,-31.0625 -1.0235,-6.998 -18.88266,-18.38043 -42.22262,-45.81545 23.11839,25.66768 42.65103,40.10972 42.31637,45.75295 15.18653,-6.16263 15.88219,-19.26899 8.92398,-28.52504 -25.17844,-18.14393 -47.18822,-37.47898 -72.36824,-56.58981 0,0 -4.64225,-4.09784 -6.93074,-3.0414 z"
-                 style="fill:#d38d5f;fill-opacity:1;fill-rule:evenodd;stroke:#502d16;stroke-width:2.71947;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-              <path
-                 sodipodi:nodetypes="cc"
-                 id="path1549"
-                 d="m 168.24779,168.92114 c 23.13397,11.51861 44.28729,9.17267 64.46537,0"
-                 style="fill:#d38d5f;fill-opacity:1;fill-rule:evenodd;stroke:#502d16;stroke-width:2.71947;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            </g>
-          </g>
-          <g
-             inkscape:label="Reflet final"
-             id="g1555"
-             style="fill:#d38d5f;stroke:#502d16" />
-          <g
-             inkscape:label="Contour final"
-             id="g1557"
-             style="fill:#d38d5f;stroke:#502d16" />
-        </g>
-      </g>
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="400"
-     inkscape:cy="560"
-     inkscape:document-units="mm"
-     inkscape:current-layer="svg878"
-     inkscape:document-rotation="0"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="2073"
-     inkscape:window-height="997"
-     inkscape:window-x="114"
-     inkscape:window-y="114"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata875">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="g1510"
-     style="fill:#784421;stroke:#ffffff;image-rendering:auto"
-     transform="translate(-1.0583648,-3.7366014)">
-    <g
-       inkscape:label="Clip"
-       id="g1726"
-       style="fill:#784421;stroke:#ffffff">
-      <g
-         id="g3257"
-         transform="matrix(0.28980934,0,0,0.21909426,120.56466,-12.741092)"
-         style="display:inline;fill:#784421;stroke:#ffffff;stroke-width:2.16856">
-        <path
-           sodipodi:nodetypes="cccccc"
-           id="rect3250"
-           d="m -174.5565,130.97253 h 15.40856 v 508.4827 l -7.70428,24 -7.70428,-24 z"
-           style="fill:#784421;stroke:#ffffff;stroke-width:2.16856" />
-        <path
-           transform="matrix(1.001146,0,0,0.893038,2.193524,15.82179)"
-           style="fill:#784421;stroke:#ffffff;stroke-width:2.29344"
-           d="m -145.09735,123.91028 c 0,13.11269 -10.64218,17.6523 -23.75487,17.6523 -13.11269,0 -23.75487,-4.53961 -23.75487,-17.6523 0,-13.11269 10.64218,-23.75487 23.75487,-23.75487 13.11269,0 23.75487,10.64218 23.75487,23.75487 z"
-           id="path3252"
-           sodipodi:nodetypes="csssc" />
-        <path
-           style="fill:#784421;stroke:#ffffff;stroke-width:2.16856"
-           d="m -146.94948,221.199 c 0,8.50553 -8.91642,12.68366 -19.90273,12.68366 -10.98631,0 -19.90273,-4.17813 -19.90273,-12.68366 0,-8.50553 8.91642,-9.95873 19.90273,-9.95873 10.98631,0 19.90273,1.4532 19.90273,9.95873 z"
-           id="path3254"
-           sodipodi:nodetypes="csssc" />
-      </g>
-      <g
-         style="display:inline;fill:#784421;stroke:#ffffff"
-         id="g2066"
-         transform="matrix(0.20847315,-0.03662954,0.03662954,0.20847315,-0.34176516,-0.20270665)">
-        <g
-           inkscape:label="Fond écu"
-           id="g2068"
-           style="fill:#784421;stroke:#ffffff" />
-        <g
-           style="opacity:1;fill:#784421;stroke:#ffffff"
-           inkscape:label="Meubles"
-           id="g2070">
-          <g
-             id="g4219"
-             transform="matrix(0.714908,0,0,0.756557,137.7704,128.4719)"
-             style="display:inline;fill:#784421;fill-opacity:1;stroke:#ffffff;stroke-width:2.71947;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-            <path
-               sodipodi:nodetypes="ccccc"
-               id="path4221"
-               d="m 160.08787,143.23938 39.92645,57.31251 39.53535,-57.31251 h -40.3837 z"
-               style="fill:#784421;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.71947;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               sodipodi:nodetypes="ccccccccccccccccccccc"
-               id="path4223"
-               d="m 193.20453,145.31745 c -24.41443,20.15923 -49.98749,37.33861 -73.2768,58.5917 -6.37089,11.43876 -4.50952,20.09512 9.2768,25.68955 14.75917,-16.92275 18.76874,-17.90421 41.38418,-46.03566 -22.42258,29.55858 -41.45116,42.84434 -41.29043,46.09816 5.38114,19.66042 0.98803,22.70493 25.28125,31.0625 2.90109,-14.41044 25.62687,-63.19056 32.51802,-70.81345 -6.73696,8.18151 -29.75646,56.59527 -32.58052,71.37595 18.94602,17.92 18.75832,19.45149 44.6875,14.03125 l 0.375,-80.91001 0.375,80.91001 c 21.42445,5.42024 29.31401,4.7897 44.65625,-14.03125 -3.59166,-13.24549 -25.62533,-59.96461 -31.64832,-69.57405 4.75359,7.7904 26.43091,52.99484 31.61707,69.01155 18.88754,-8.35757 21.70202,-8.69924 25.28125,-31.0625 -1.0235,-6.998 -18.88266,-18.38043 -42.22262,-45.81545 23.11839,25.66768 42.65103,40.10972 42.31637,45.75295 15.18653,-6.16263 15.88219,-19.26899 8.92398,-28.52504 -25.17844,-18.14393 -47.18822,-37.47898 -72.36824,-56.58981 0,0 -4.64225,-4.09784 -6.93074,-3.0414 z"
-               style="fill:#784421;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.71947;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               sodipodi:nodetypes="cc"
-               id="path4225"
-               d="m 168.24779,168.92114 c 23.13397,11.51861 44.28729,9.17267 64.46537,0"
-               style="fill:#784421;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.71947;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          </g>
-        </g>
-        <g
-           inkscape:label="Reflet final"
-           id="g2076"
-           style="fill:#784421;stroke:#ffffff" />
-        <g
-           inkscape:label="Contour final"
-           id="g2078"
-           style="fill:#784421;stroke:#ffffff" />
-      </g>
-    </g>
-  </g>
-</svg>

icons/tmr/scroll.svg

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 511.999 511.999" style="enable-background:new 0 0 511.999 511.999;" xml:space="preserve">
-<path style="fill:#CCAC68;" d="M145.179,371.239H95.282c-35.205,0-63.745,28.539-63.745,63.745l0,0
-	c0,35.205,28.539,63.745,63.745,63.745H266.31v-93.993L145.179,371.239z"/>
-<path style="fill:#E6C275;" d="M356.848,140.762L154.642,13.272H90.44l0,0c-60.783,0-99.78,64.617-71.453,118.395l138.469,262.878
-	h-0.022c25.403,47.058-8.675,104.182-62.152,104.182h336.415c53.477,0,87.555-57.123,62.152-104.182L356.848,140.762z"/>
-<path style="fill:#FFD782;" d="M90.44,13.272c35.205,0,63.745,28.54,63.745,63.745l0,0c0,35.205-28.54,63.745-63.745,63.745h266.408
-	c35.205,0,63.745-28.54,63.745-63.745l0,0c0-35.205-28.54-63.745-63.745-63.745C356.848,13.272,90.44,13.272,90.44,13.272z"/>
-<path d="M342.963,489.153c0,0-195.544,0-195.559,0c1.764,0,6.043-5.742,7.172-6.989c17.747-19.618,25.167-48.132,18.443-73.982
-	c-2.737-10.522-8.091-19.987-13.121-29.534L27.455,127.206C15.728,104.945,16.489,78.792,29.49,57.25
-	c13.001-21.543,35.785-34.403,60.947-34.403c29.869,0,54.17,24.3,54.17,54.17s-24.3,54.17-54.17,54.17
-	c-5.289,0-9.575,4.286-9.575,9.576c0,5.289,4.286,9.575,9.575,9.575h260.695l31.745,58.803c2.512,4.655,8.318,6.387,12.973,3.877
-	c4.655-2.512,6.389-8.321,3.877-12.973l-27.694-51.301c33.163-7.016,58.129-36.507,58.129-71.729c0-40.429-32.892-73.32-73.32-73.32
-	H240.78c-5.289,0-9.575,4.286-9.575,9.575s4.286,9.575,9.575,9.575h116.063c29.869,0,54.17,24.3,54.17,54.17
-	c0,29.866-24.293,54.164-54.17,54.17H139.796c0.919-0.839,1.818-1.7,2.694-2.584c13.491-13.615,21.266-32.414,21.266-51.587
-	c0-20.045-8.544-39.648-23.128-53.374c-0.28-0.263-0.546-0.537-0.83-0.797h56.304c5.289,0,9.575-4.286,9.575-9.575
-	s-4.286-9.575-9.575-9.575c0,0-105.664,0-105.665,0c-31.931,0-60.842,16.32-77.341,43.658
-	c-16.498,27.337-17.463,60.524-2.581,88.774l118.798,225.535H95.277c-40.428,0-73.32,32.891-73.32,73.32s32.892,73.32,73.32,73.32
-	c0.027,0,0.052-0.001,0.078-0.001h247.609c5.289,0,9.575-4.286,9.575-9.575S348.252,489.153,342.963,489.153z M41.107,434.984
-	c0-29.869,24.3-54.17,54.17-54.17h44.118c3.82,7.251,8.046,14.427,11.417,21.9c3.922,8.533,5.779,17.635,5.584,26.694
-	c-0.706,32.866-28.393,59.744-61.136,59.744C65.399,489.146,41.107,464.848,41.107,434.984z"/>
-<path d="M502.27,389.999l-78.422-145.272c-2.514-4.655-8.322-6.389-12.973-3.877c-4.655,2.512-6.389,8.321-3.877,12.973
-	l78.423,145.272c10.312,19.103,9.829,41.639-1.293,60.283c-11.123,18.645-30.724,29.776-52.434,29.776h-44.048
-	c-5.289,0-9.575,4.286-9.575,9.575s4.286,9.575,9.575,9.575h44.048c28.52,0,54.269-14.622,68.88-39.114
-	C515.184,444.697,515.818,415.093,502.27,389.999z"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

icons/tmr/treasure-chest.svg

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 496 496" style="enable-background:new 0 0 496 496;" xml:space="preserve">
-<path style="fill:#5B402E;" d="M0,232v167.2C0,460.8,52,456,113.6,456h268c61.6,0,113.6,4.8,113.6-56.8V232H0z"/>
-<path style="fill:#493322;" d="M112,456h270.4c61.6,0,113.6,4.8,113.6-56.8V232"/>
-<path style="fill:#5B402E;" d="M496,192v-40c0-61.6-52-112-113.6-112H113.6C52,40,0,90.4,0,152v40H496z"/>
-<path style="fill:#493322;" d="M0,152v40h496v-40c0-61.6-52-112-113.6-112"/>
-<rect y="232" style="fill:#F2B111;" width="496" height="64"/>
-<polyline style="fill:#E88813;" points="0,296 496,296 496,232 "/>
-<rect y="152" style="fill:#F2B111;" width="496" height="40"/>
-<g>
-	<polyline style="fill:#E88813;" points="0,192 496,192 496,152 	"/>
-	<rect x="104" y="32" style="fill:#E88813;" width="56" height="152"/>
-	<rect x="336" y="32" style="fill:#E88813;" width="56" height="152"/>
-	<rect x="104" y="288" style="fill:#E88813;" width="56" height="176"/>
-	<rect x="336" y="288" style="fill:#E88813;" width="56" height="176"/>
-</g>
-<g>
-	<circle style="fill:#493322;" cx="184" cy="264.8" r="8.8"/>
-	<circle style="fill:#493322;" cx="226.4" cy="264.8" r="8.8"/>
-	<circle style="fill:#493322;" cx="269.6" cy="264.8" r="8.8"/>
-	<circle style="fill:#493322;" cx="312" cy="264.8" r="8.8"/>
-	<circle style="fill:#493322;" cx="33.6" cy="264.8" r="8.8"/>
-	<circle style="fill:#493322;" cx="75.2" cy="264.8" r="8.8"/>
-	<circle style="fill:#493322;" cx="420" cy="264.8" r="8.8"/>
-	<circle style="fill:#493322;" cx="462.4" cy="264.8" r="8.8"/>
-</g>
-<path style="fill:#F2B111;" d="M276,346.4c0-15.2-12.8-28-28-28s-28,12.8-28,28c0,10.4,5.6,20,13.6,25.6l-8,52h44.8l-8-52
-	C270.4,367.2,276,356.8,276,346.4z"/>
-<path style="fill:#E88813;" d="M270.4,424l-8-52c8-4.8,13.6-15.2,13.6-25.6c0-15.2-12.8-28-28-28s-28,12.8-28,28"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>

lang/fr.json

@@ -0,0 +1,44 @@
+{
+  "ACTOR": {
+    "TypePersonnage": "Personnage",
+    "TypeCreature": "Créature",
+    "TypeEntite": "Entité de cauchemar",
+    "TypeVehicule": "Véhicule"
+  },
+  "ITEM": {
+    "TypeObjet": "Objet",
+    "TypeCompetence": "Compétence",
+    "TypeCompetencecreature": "Compétence de créature",
+    "TypeMaladie": "Maladie",
+    "TypePoison": "Poison",
+    "TypeNombreastral": "Nombre astral",
+    "TypeTarot": "Carte de tarot",
+    "TypeCasetmr": "TMR spéciale",
+    "TypeRencontrestmr": "Rencontre TMR",
+    "TypeMunition": "Munition",
+    "TypeMonnaie": "Monnaie",
+    "TypeHerbe": "Herbe ou plante",
+    "TypeIngredient": "Ingrédient",
+    "TypeLivre": "Livre",
+    "TypePotion": "Potion",
+    "TypeArme": "Arme",
+    "TypeArmure": "Armure",
+    "TypeConteneur": "Conteneur",
+    "TypeNourritureboisson": "Nourriture & boisson",
+    "TypeChant": "Chant",
+    "TypeDanse": "Danse",
+    "TypeMusique": "Musique",
+    "TypeOeuvre": "Oeuvre",
+    "TypeTache": "Tâche",
+    "TypeJeu": "Jeu",
+    "TypeRecettealchimique": "Recette alchimique",
+    "TypeRecettecuisine": "Recette de cuisine",
+    "TypeSort": "Sort",
+    "TypeMeditation": "Méditation",
+    "TypeSignedraconique": "Signe draconique",
+    "TypeQueue": "Queue de Dragon",
+    "TypeOmbre": "Ombre de Thanatos",
+    "TypeSouffle": "Souffle de Dragon",
+    "TypeTete": "Tête de Dragon"
+  }
+}

module/actor-creature-sheet.js

@@ -7,6 +7,7 @@
 import { HtmlUtility } from "./html-utility.js";
 import { RdDUtility } from "./rdd-utility.js";
 import { RdDActorSheet } from "./actor-sheet.js";
+import { RdDCarac } from "./rdd-carac.js";
 
 /* -------------------------------------------- */
 export class RdDActorCreatureSheet extends RdDActorSheet {
@@ -25,41 +26,23 @@ export class RdDActorCreatureSheet extends RdDActorSheet {
 
 
   /* -------------------------------------------- */
-  getData() {
-    let data = super.getData();
-    console.log("Creature : ", data);
-
-    data.itemsByType = {};
-    for (const item of data.items) {
-      let list = data.itemsByType[item.type];
-      if (!list) {
-        list = [];
-        data.itemsByType[item.type] = list;
-      }
-      list.push(item);
+  async getData() {
+    let formData = await super.getData();
+    console.log("Creature : ", formData);
+    formData.calc = {
+      caracTotal: RdDCarac.computeTotal(formData.data.carac),
+      resumeBlessures: this.actor.computeResumeBlessure(formData.data.blessures),
+      encTotal: await this.actor.computeEncombrementTotalEtMalusArmure(),
     }
+    formData.calc.surEncombrementMessage = (formData.data.compteurs.surenc.value < 0) ? "Sur-Encombrement!" : "";
 
-    // Compute current carac sum
-    let sum = 0;
-    Object.values(data.data.carac).forEach(carac => { if (!carac.derivee) { sum += parseInt(carac.value) } });
-    data.data.caracSum = sum;
+    RdDUtility.filterItemsPerTypeForSheet(formData);
+    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
+    formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
 
-    data.data.carac.taille.isTaille = true; // To avoid button link;
-    data.data.blessures.resume = this.actor.computeResumeBlessure(data.data.blessures);
+    console.log("Creature : ", this.objetVersConteneur, formData);
 
-    data.data.isGM = game.user.isGM;
-
-    data.data.competencecreature = data.itemsByType["competencecreature"];
-
-    this.actor.computeEncombrementTotalEtMalusArmure();
-    RdDUtility.filterItemsPerTypeForSheet(data);
-    RdDUtility.buildArbreDeConteneur(this, data);
-    data.data.encTotal = this.actor.encTotal;
-    data.data.isGM = game.user.isGM;
-
-    console.log("Creature : ", this.objetVersConteneur, data);
-
-    return data;
+    return formData;
   }
 
   /* -------------------------------------------- */
@@ -87,17 +70,6 @@ export class RdDActorCreatureSheet extends RdDActorSheet {
     });
   }
 
-  /* -------------------------------------------- */
-
-  /** @override */
-  setPosition(options = {}) {
-    const position = super.setPosition(options);
-    const sheetBody = this.element.find(".sheet-body");
-    const bodyHeight = position.height - 192;
-    sheetBody.css("height", bodyHeight);
-    return position;
-  }
-
   /* -------------------------------------------- */
   /** @override */
   _updateObject(event, formData) {

module/actor-entite-sheet.js

@@ -4,6 +4,8 @@
  */
 
 import { HtmlUtility } from "./html-utility.js";
+import { Misc } from "./misc.js";
+import { RdDUtility } from "./rdd-utility.js";
 
 /* -------------------------------------------- */  
 export class RdDActorEntiteSheet extends ActorSheet {
@@ -29,24 +31,31 @@ export class RdDActorEntiteSheet extends ActorSheet {
   }
 
   /* -------------------------------------------- */
-  getData() {
-    let data = super.getData();
+  async getData() {
+    const objectData = Misc.data(this.object);
+    let formData = {
+      title: this.title,
+      id: objectData.id,
+      type: objectData.type,
+      img: objectData.img,
+      name: objectData.name,
+      //   actor: this.object,
+      editable: this.isEditable,
+      cssClass: this.isEditable ? "editable" : "locked",
+      data: foundry.utils.deepClone(Misc.templateData(this.object)),
+      effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
+      //   items: items,
+      limited: this.object.limited,
+      options: this.options,
+      owner: this.document.isOwner,
+      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i.data))),
+    };
     
-    data.itemsByType = {};
-    for (const item of data.items) {
-      let list = data.itemsByType[item.type];
-      if (!list) {
-        list = [];
-        data.itemsByType[item.type] = list;
-      }
-      list.push(item);
-    }
-    
-    data.data.carac.taille.isTaille = true; // To avoid button link;
-    data.data.competencecreature = data.itemsByType["competencecreature"];
-    data.data.isGM = game.user.isGM;
+    formData.options.isGM = game.user.isGM;
+    RdDUtility.filterItemsPerTypeForSheet(formData);
 
-    return data;
+
+    return formData;
   }
   
   /* -------------------------------------------- */
@@ -62,14 +71,14 @@ export class RdDActorEntiteSheet extends ActorSheet {
     // Update Inventory Item
     html.find('.item-edit').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
-      const item = this.actor.getOwnedItem(li.data("itemId"));
+      const item = this.actor.getEmbeddedDocument('Item', li.data("itemId"));
       item.sheet.render(true);
     });
 
     // Delete Inventory Item
     html.find('.item-delete').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
-      this.actor.deleteOwnedItem(li.data("itemId"));
+      this.actor.deleteEmbeddedDocuments('Item', [li.data("itemId")]);
       li.slideUp(200, () => this.render(false));
     });
 
@@ -108,7 +117,7 @@ export class RdDActorEntiteSheet extends ActorSheet {
       this.render(true);
     });
 
-    html.find('#encaisser-direct').click(ev => {
+    html.find('.encaisser-direct').click(ev => {
       this.actor.encaisser();
     });
 
@@ -123,10 +132,12 @@ export class RdDActorEntiteSheet extends ActorSheet {
   /* -------------------------------------------- */
 
   /** @override */
-  setPosition(options={}) {
+  setPosition(options = {}) {
     const position = super.setPosition(options);
+    const sheetHeader = this.element.find(".sheet-header");
+    const sheetTabs = this.element.find(".sheet-tabs");
     const sheetBody = this.element.find(".sheet-body");
-    const bodyHeight = position.height - 192;
+    const bodyHeight = position.height - sheetHeader[0].clientHeight - sheetTabs[0].clientHeight;
     sheetBody.css("height", bodyHeight);
     return position;
   }

module/actor-sheet.js

@@ -10,6 +10,10 @@ import { RdDItemCompetence } from "./item-competence.js";
 import { RdDBonus } from "./rdd-bonus.js";
 import { Misc } from "./misc.js";
 import { RdDCombatManager } from "./rdd-combat.js";
+import { RdDCarac } from "./rdd-carac.js";
+import { RdDItem } from "./item.js";
+import { DialogSplitItem } from "./dialog-split-item.js";
+import { ReglesOptionelles } from "./regles-optionelles.js";
 
 /* -------------------------------------------- */
 export class RdDActorSheet extends ActorSheet {
@@ -26,334 +30,324 @@ export class RdDActorSheet extends ActorSheet {
       dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
       editCaracComp: false,
       showCompNiveauBase: false,
-      montrerArchetype: false
+      montrerArchetype: false,
+      hideControls: true
     });
   }
 
   /* -------------------------------------------- */
-  getData() {
-    let data = super.getData();
-    if ( data.actor.type == 'creature' || data.actor.type == 'humanoide') return data; // Shortcut
-
-    data.data.editCaracComp = this.options.editCaracComp;
-    data.data.showCompNiveauBase = this.options.showCompNiveauBase;
-    data.data.montrerArchetype = this.options.montrerArchetype;
-
-    data.itemsByType = Misc.classify(data.items);
-
-    // Competence per category
-    data.data.comptageArchetype = RdDUtility.getLimitesArchetypes();
-    data.data.competenceXPTotal = 0;
-    data.competenceByCategory = Misc.classify(
-      data.itemsByType.competence,
-      item => item.data.categorie,
-      item => {
-        let archetypeKey = (item.data.niveau_archetype < 0) ? 0 : item.data.niveau_archetype;
-        if (data.data.comptageArchetype[archetypeKey] == undefined) {
-          data.data.comptageArchetype[archetypeKey] = { "niveau": archetypeKey, "nombreMax": 0, "nombre": 0};
-        }
-        data.data.comptageArchetype[archetypeKey].nombre = (data.data.comptageArchetype[archetypeKey]?.nombre??0) + 1; //Comptage archetype
-        item.data.xpNext = RdDItemCompetence.getCompetenceNextXp(item.data.niveau);
-        item.data.isLevelUp = item.data.xp >= item.data.xpNext; // Flag de niveau à MAJ
-        //this.actor.checkCompetenceXP(item.name); // Petite vérification experience
-        item.data.showCompetence = !data.data.showCompNiveauBase || (Number(item.data.niveau) != Number(RdDUtility.getLevelCategory(item.data.categorie)));
-        // Ignorer les compétences 'troncs' à ce stade
-        data.data.competenceXPTotal += RdDItemCompetence.computeCompetenceXPCost(item);
-        return item;
-      });
-    data.data.competenceXPTotal -= RdDItemCompetence.computeEconomieCompetenceTroncXP(data.itemsByType.competence);
-
-    // Compute current carac sum
-    let sum = 0;
-    for (let caracName in data.data.carac) {
-      let currentCarac = data.data.carac[caracName];
-      if (!currentCarac.derivee) {
-        sum += parseInt(currentCarac.value);      
-      }
-      currentCarac.xpNext = RdDUtility.getCaracNextXp(currentCarac.value);
-      currentCarac.isLevelUp = (currentCarac.xp >= currentCarac.xpNext);
-    }
-    sum += (data.data.beaute >= 0) ? (data.data.beaute - 10) : 0;
-    data.data.caracSum = sum;
-
-    // Force empty arme, at least for Esquive
-    if (data.itemsByType.arme == undefined) data.itemsByType.arme = [];
-    for (const arme of data.itemsByType.arme) {
-      arme.data.niveau = 0; // Per default, TODO to be fixed
-      for (const melee of data.competenceByCategory.melee) {
-        if (melee.name == arme.data.competence)
-          arme.data.niveau = melee.data.niveau
-      }
-      for (const tir of data.competenceByCategory.tir) {
-        if (tir.name == arme.data.competence)
-          arme.data.niveau = tir.data.niveau
-      }
-      for (const lancer of data.competenceByCategory.lancer) {
-        if (lancer.name == arme.data.competence)
-          arme.data.niveau = lancer.data.niveau
-      }
-    }
-
-    // To avoid armour and so on...
-    data.data.combat = duplicate(RdDUtility.checkNull(data.itemsByType['arme']));
-    data.data.combat = RdDCombatManager.finalizeArmeList(data.data.combat, data.itemsByType.competence, data.data.carac);
-
-    data.esquive = { name: "Esquive", niveau: data.competenceByCategory?.melee.find(it => it.name == 'Esquive')?.data.niveau ?? -6};
-    let corpsACorps = data.competenceByCategory?.melee.find(it => it.name == 'Corps à corps');
-    if (corpsACorps) {
-      let cc_init = RdDCombatManager.calculInitiative(corpsACorps.data.niveau, data.data.carac['melee'].value);
-      data.data.combat.push(RdDItemArme.mainsNues({ niveau: corpsACorps.data.niveau, initiative: cc_init }));
-    }
-    this.armesList = duplicate(data.data.combat);
-
-    data.data.carac.taille.isTaille = true; // To avoid button link;
-    data.data.compteurs.chance.isChance = true;
-    data.data.blessures.resume = this.actor.computeResumeBlessure(data.data.blessures);
-
-    // Mise à jour de l'encombrement total et du prix de l'équipement
-    this.actor.computeEncombrementTotalEtMalusArmure();
-    this.actor.computePrixTotalEquipement();
+  async getData() {
+    const objectData = Misc.data(this.object);
     
-    // Common data
-    data.data.competenceByCategory = data.competenceByCategory;
-    data.data.encTotal = this.actor.encTotal;
-    data.data.prixTotalEquipement = this.actor.prixTotalEquipement;
-    data.data.surprise = RdDBonus.find(this.actor.getSurprise(false)).descr;
-    data.data.isGM = game.user.isGM;
-    data.ajustementsConditions = CONFIG.RDD.ajustementsConditions;
-    data.difficultesLibres = CONFIG.RDD.difficultesLibres;
+    //this.actor.checkMonnaiePresence(this.actor.data.items); // Always check 
 
-    // low is normal, this the base used to compute the grid.
-    data.data.fatigue = {
-      malus: RdDUtility.calculMalusFatigue(data.data.sante.fatigue.value, data.data.sante.endurance.max),
-      html: "<table class='table-fatigue'>" + RdDUtility.makeHTMLfatigueMatrix(data.data.sante.fatigue.value, data.data.sante.endurance.max).html() + "</table>"
+    let formData = {
+      title: this.title,
+      id: objectData.id,
+      type: objectData.type,
+      img: objectData.img,
+      name: objectData.name,
+      editable: this.isEditable,
+      cssClass: this.isEditable ? "editable" : "locked",
+      data: foundry.utils.deepClone(Misc.templateData(this.object)),
+      effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
+      limited: this.object.limited,
+      options: this.options,
+      owner: this.document.isOwner,
+      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i.data))),
+    };
+
+    RdDUtility.filterItemsPerTypeForSheet(formData);
+
+    formData.options.isGM = game.user.isGM;
+
+    if (formData.type == 'creature') return formData; // Shortcut
+
+    formData.competenceByCategory = Misc.classify(formData.competences, it => it.data.categorie);
+
+    formData.calc = {
+      comptageArchetype: RdDItemCompetence.computeResumeArchetype(formData.competences),
+      competenceXPTotal: RdDItemCompetence.computeTotalXP(formData.competences),
+      caracTotal: RdDCarac.computeTotal(formData.data.carac, formData.data.beaute),
+      // Mise à jour de l'encombrement total et du prix de l'équipement
+      encTotal: await this.actor.computeEncombrementTotalEtMalusArmure(),
+      prixTotalEquipement: this.actor.computePrixTotalEquipement(),
+      surprise: RdDBonus.find(this.actor.getSurprise(false)).descr,
+      fatigue: RdDUtility.calculFatigueHtml(formData.data.sante.fatigue.value, formData.data.sante.endurance.max),
+      resumeBlessures: this.actor.computeResumeBlessure(formData.data.blessures),
+    };
+    formData.calc.surEncombrementMessage = (formData.data.compteurs.surenc.value < 0) ? "Sur-Encombrement!" : "";
+
+    formData.competences.forEach(item => {
+      item.visible = !this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(item);
+      RdDItemCompetence.levelUp(item);
+    });
+
+    Object.values(formData.data.carac).forEach(c => {
+      RdDCarac.levelUp(c);
+    });
+
+
+    // toujours avoir une liste d'armes (pour mettre esquive et corps à corps)
+    formData.combat = duplicate(formData.armes ?? []);
+    RdDItemArme.computeNiveauArmes(formData.combat, formData.competences);
+    RdDItemArme.ajoutCorpsACorps(formData.combat, formData.competences, formData.data.carac);
+    formData.esquive = RdDItemCompetence.getEsquive(formData.competences);
+    formData.combat = RdDCombatManager.finalizeArmeList(formData.combat, formData.competences, formData.data.carac);
+
+    this.armesList = formData.combat;
+
+    // Common data
+    formData.ajustementsConditions = CONFIG.RDD.ajustementsConditions;
+    formData.difficultesLibres = CONFIG.RDD.difficultesLibres;
+
+    formData.hautreve = {
+      isDemiReve: this.actor.listeEffets( it => it.label == "Demi-rêve").length > 0,
+      sortsReserve: formData.data.reve.reserve.list,
+      rencontres: duplicate(formData.data.reve.rencontre.list),
+      casesTmr: formData.itemsByType.casetmr,
+      cacheTMR: this.actor.isTMRCache()
     }
 
-    RdDUtility.filterItemsPerTypeForSheet(data);
-    data.data.sortReserve = data.data.reve.reserve.list;
-    data.data.rencontres  = duplicate(data.data.reve.rencontre.list);
-    data.data.caseSpeciales = data.itemsByType['casetmr'];
-    RdDUtility.buildArbreDeConteneur(this, data);
-    data.data.surEncombrementMessage = (data.data.compteurs.surenc.value < 0) ? "Sur-Encombrement!" : "";
-    data.data.vehiculesList = this.actor.buildVehiculesList();
-    data.data.monturesList  = this.actor.buildMonturesList();
-    data.data.suivantsList  = this.actor.buildSuivantsList();
-    return data;
+    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
+    formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
+
+    formData.subacteurs = {
+      vehicules: this.actor.listeVehicules(),
+      montures: this.actor.listeMontures(),
+      suivants: this.actor.listeSuivants()
+    }
+    if (this.actor.getBestDraconic().data.niveau > -11 && !this.actor.isHautRevant()) {
+      ui.notifications.error(`${this.actor.name} a des compétences draconiques, mais pas le don de Haut-Rêve!
+        <br>Ajoutez-lui la tête "Don de Haut-Rêve" pour lui permettre d'utiliser ses compétences et d'accéder aux terres médianes du rêve`);
+    }
+    return formData;
+  }
+
+  isCompetenceAffichable(competence) {
+    return !this.options.showCompNiveauBase || !RdDItemCompetence.isNiveauBase(competence);
   }
 
   /* -------------------------------------------- */
-  async _onDrop(event) {
-    let toSuper = await RdDUtility.processItemDropEvent(this, event);
-    if ( toSuper) {
-      super._onDrop(event);
+  async _onDropActor(event, dragData) {
+    console.log("DRAG", this.actor.id, dragData);
+    this.actor.addSubacteur(dragData.id || dragData.data._id);
+    super._onDropActor(event, dragData);
+  }
+
+  /* -------------------------------------------- */
+  async _onDropItem(event, dragData) {
+    const callSuper = await this.actor.processDropItem(event, dragData, this.objetVersConteneur);
+    if (callSuper) {
+      await super._onDropItem(event, dragData)
     }
   }
 
+  /* -------------------------------------------- */
+  async createItem(name, type) {
+    await this.actor.createEmbeddedDocuments('Item', [{ name: name, type: type }], { renderSheet: true });
+  }
+
   /* -------------------------------------------- */
   async createEmptyTache() {
-    await this.actor.createOwnedItem({ name: 'Nouvelle tache', type: 'tache' }, { renderSheet: true });
+    await this.createItem('Nouvelle tache', 'tache');
   }
 
-  /* -------------------------------------------- */
-  async creerObjet() {
-    let itemType = $("#creer-equipement").val();
-    await this.actor.createOwnedItem({ name: 'Nouveau ' + itemType, type: itemType }, { renderSheet: true });
-  }
-
-  /* -------------------------------------------- */
-  async selectObjetType() {
-    let itemType = ["objet", "arme", "armure", "conteneur", "herbe", "ingredient", "livre", "potion", "munition", "monnaie"];
-    let options = '<span class="competence-label">Selectionnez le type d\'équipement</span><select id="creer-equipement">';
-    for (let typeName of itemType) {
-      options += '<option value="' + typeName + '">' + typeName + '</option>'
-    }
-    options += '</select>';
-    let d = new Dialog({
-      title: "Créer un équipement",
-      content: options,
-      buttons: {
-        one: {
-          icon: '<i class="fas fa-check"></i>',
-          label: "Créer l'objet",
-          callback: () => this.creerObjet()
-        }
-      }
-    });
-    d.render(true);
-  }
-
-  /* -------------------------------------------- */
-  /** @override */
+  /* -------------------------------------------- */  /** @override */
   activateListeners(html) {
     super.activateListeners(html);
 
     HtmlUtility._showControlWhen($(".gm-only"), game.user.isGM);
-
-    html.find('#show-hide-competences').click((event) => {
-      this.options.showCompNiveauBase = !this.options.showCompNiveauBase;
-      this.render(true);
-    });
+    HtmlUtility._showControlWhen($(".appliquerFatigue"), ReglesOptionelles.isUsing("appliquer-fatigue"));
 
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
 
-    html.find('.item-edit').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      const item = this.actor.getOwnedItem(li.data("item-id"));
+    html.find('.item-split').click(async event => {
+      const li = $(event.currentTarget).parents(".item");
+      const item = this.actor.items.get(li.data("item-id"));
+      this.splitItem(item);
+    });
+    html.find('.item-edit').click(async event => {
+      const li = $(event.currentTarget).parents(".item");
+      const item = this.actor.items.get(li.data("item-id"));
       item.sheet.render(true);
     });
-    // Update Inventory Item
-    html.find('.rencontre-delete').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
+    html.find('.display-label a').click(async event => {
+      let myID = event.currentTarget.attributes['data-item-id'].value;
+      const item = this.actor.getEmbeddedDocument('Item', myID);
+      item.sheet.render(true);
+    });
+    html.find('.rencontre-delete').click(async event => {
+      const li = $(event.currentTarget).parents(".item");
       const rencontreKey = li.data("item-id");
       this.actor.deleteTMRRencontre(rencontreKey);
     });
-
-    // Delete Inventory Item
-    html.find('.item-delete').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
+    html.find('.item-delete').click(async event => {
+      const li = $(event.currentTarget).parents(".item");
       RdDUtility.confirmerSuppression(this, li);
-    });    
-    html.find('.subacteur-delete').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
+    });
+    html.find('.item-vendre').click(async event => {
+      const li = $(event.currentTarget).parents(".item");
+      const itemId = li.data("item-id");
+      const item = this.actor.getObjet(itemId);
+      item?.proposerVente();
+    });
+    html.find('.item-action').click(async event => {
+      const li = $(event.currentTarget).parents(".item");
+      const itemId = li.data("item-id");
+      const item = this.actor.getObjet(itemId);
+      this.actor.actionItem(item);
+    });
+    html.find('.subacteur-delete').click(async event => {
+      const li = $(event.currentTarget).parents(".item");
       RdDUtility.confirmerSuppressionSubacteur(this, li);
     });
-    
-    html.find('#encaisser-direct').click(ev => {
+
+    html.find('.encaisser-direct').click(async event => {
       this.actor.encaisser();
     });
 
-    html.find('.remise-a-neuf').click(ev => {
+    html.find('.remise-a-neuf').click(async event => {
       if (game.user.isGM) {
         this.actor.remiseANeuf();
-        ev.preventDefault();
       }
     });
-    html.find('#creer-tache').click(ev => {
+    html.find('.creer-tache').click(async event => {
       this.createEmptyTache();
     });
-    html.find('#creer-un-objet').click(ev => {
-      this.selectObjetType();
+    html.find('.creer-un-objet').click(async event => {
+      RdDUtility.selectObjetType( this );
     });
-    html.find('#nettoyer-conteneurs').click(ev => {
+    html.find('.creer-une-oeuvre').click(async event => {
+      RdDUtility.selectTypeOeuvre(this);
+    });
+    html.find('#nettoyer-conteneurs').click(async event => {
       this.actor.nettoyerConteneurs();
     });
 
     // Blessure control
-    html.find('.blessure-control').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let btype = li.data("blessure-type");
-      let index = li.data('blessure-index');
-      let active = $(ev.currentTarget).data('blessure-active');
+    html.find('.blessure-control').click(async event => {
+      const tr = $(event.currentTarget).parents(".item");
+      let btype = tr.data("blessure-type");
+      let index = tr.data('blessure-index');
+      let active = $(event.currentTarget).data('blessure-active');
       //console.log(btype, index, active);
-      this.actor.manageBlessureFromSheet(btype, index, active).then(this.render(true));
+      await this.actor.manageBlessureFromSheet(btype, index, active);
     });
 
     // Blessure data
-    html.find('.blessures-soins').change(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let btype = li.data('blessure-type');
-      let index = li.data('blessure-index');
-      let psoins = li.find('input[name=premiers_soins]').val();
-      let pcomplets = li.find('input[name=soins_complets]').val();
-      let jours = li.find('input[name=jours]').val();
-      let loc = li.find('input[name=localisation]').val();
+    html.find('.blessures-soins').change(async event => {
+      const tr = $(event.currentTarget).parents(".item");
+      let btype = tr.data('blessure-type');
+      let index = tr.data('blessure-index');
+      let psoins = tr.find('.blessure-premiers_soins').val();
+      let pcomplets = tr.find('.blessure-soins_complets').val();
+      let jours = tr.find('.blessure-jours').val();
+      let loc = tr.find('.blessure-localisation').val();
       //console.log(btype, index, psoins, pcomplets, jours, loc);
-      this.actor.setDataBlessureFromSheet(btype, index, psoins, pcomplets, jours, loc).then(this.render(true));
+      await this.actor.setDataBlessureFromSheet(btype, index, psoins, pcomplets, jours, loc);
     });
 
     // Equip Inventory Item
-    html.find('.item-equip').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
+    html.find('.item-equip').click(async event => {
+      const li = $(event.currentTarget).parents(".item");
       this.actor.equiperObjet(li.data("item-id"));
-      this.render(true);
     });
 
     // Roll Carac
-    html.find('.carac-label a').click((event) => {
+    html.find('.carac-label a').click(async event => {
       let caracName = event.currentTarget.attributes.name.value;
       this.actor.rollCarac(caracName.toLowerCase());
     });
 
-    html.find('#chance-actuelle').click((event) => {
+    html.find('.chance-actuelle').click(async event => {
       this.actor.rollCarac('chance-actuelle');
     });
 
-    html.find('#chance-appel').click((event) => {
+    html.find('.chance-appel').click(async event => {
       this.actor.rollAppelChance();
     });
 
-    html.find('#jet-astrologie').click((event) => {
+    html.find('#jet-astrologie').click(async event => {
       this.actor.astrologieNombresAstraux();
     });
 
     // Roll Skill
-    html.find('.competence-label a').click((event) => {
-      let compName = event.currentTarget.text;
+    html.find('a.competence-label').click(async event => {
+      let compName = event.currentTarget.name;
       this.actor.rollCompetence(compName);
     });
-    html.find('.tache-label a').click((event) => {
+    html.find('.tache-label a').click(async event => {
       const li = $(event.currentTarget).parents(".item");
       let tacheId = li.data('item-id');
       this.actor.rollTache(tacheId);
     });
-    html.find('.meditation-label a').click((event) => {
+    html.find('.meditation-label a').click(async event => {
       const li = $(event.currentTarget).parents(".item");
       let meditationId = li.data('item-id');
       this.actor.rollMeditation(meditationId);
     });
-    html.find('.chant-label a').click((event) => {
+    html.find('.chant-label a').click(async event => {
       const li = $(event.currentTarget).parents(".item");
       let chantId = li.data('item-id');
       this.actor.rollChant(chantId);
     });
-    html.find('.danse-label a').click((event) => {
+    html.find('.danse-label a').click(async event => {
       const li = $(event.currentTarget).parents(".item");
       let danseId = li.data('item-id');
       this.actor.rollDanse(danseId);
     });
-    html.find('.musique-label a').click((event) => {
+    html.find('.musique-label a').click(async event => {
       const li = $(event.currentTarget).parents(".item");
       let musiqueId = li.data('item-id');
       this.actor.rollMusique(musiqueId);
     });
-    html.find('.oeuvre-label a').click((event) => {
+    html.find('.oeuvre-label a').click(async event => {
       const li = $(event.currentTarget).parents(".item");
       let oeuvreId = li.data('item-id');
       this.actor.rollOeuvre(oeuvreId);
     });
-    html.find('.jeu-label a').click((event) => {
+    html.find('.jeu-label a').click(async event => {
       const li = $(event.currentTarget).parents(".item");
       let jeuId = li.data('item-id');
       this.actor.rollJeu(jeuId);
     });
-    html.find('.recettecuisine-label a').click((event) => {
+    html.find('.recettecuisine-label a').click(async event => {
       const li = $(event.currentTarget).parents(".item");
       let recetteId = li.data('item-id');
       this.actor.rollRecetteCuisine(recetteId);
     });
-    html.find('.subacteur-label a').click((event) => {
+    html.find('.subacteur-label a').click(async event => {
       const li = $(event.currentTarget).parents(".item");
       let actorId = li.data('actor-id');
-      let actor = game.actors.get( actorId) ;
-      if ( actor ) {
+      let actor = game.actors.get(actorId);
+      if (actor) {
         actor.sheet.render(true);
       }
     });
     
+    // Boutons spéciaux MJs
+    html.find('.forcer-tmr-aleatoire').click(async event => {
+      this.actor.cacheTMRetMessage();
+    });
+    html.find('.afficher-tmr').click(async event => {
+      this.actor.afficheTMRetMessage();
+    });
+    
     // Points de reve actuel
-    html.find('.ptreve-actuel a').click((event) => {
+    html.find('.ptreve-actuel a').click(async event => {
       this.actor.rollCarac('reve-actuel');
     });
 
     // Roll Weapon1
-    html.find('.arme-label a').click((event) => {
+    html.find('.arme-label a').click(async event => {
       let armeName = event.currentTarget.text;
       let competenceName = event.currentTarget.attributes['data-competence-name'].value;
       this.actor.rollArme(competenceName, armeName);
     });
     // Initiative pour l'arme
-    html.find('.arme-initiative a').click((event) => {
+    html.find('.arme-initiative a').click(async event => {
       let combatant = game.combat.data.combatants.find(c => c.actor.data._id == this.actor.data._id);
       if (combatant) {
         let armeName = event.currentTarget.attributes['data-arme-name'].value;
@@ -364,203 +358,178 @@ export class RdDActorSheet extends ActorSheet {
       }
     });
     // Display TMR, visuualisation
-    html.find('#visu-tmr').click((event) => {
+    html.find('.visu-tmr').click(async event => {
       this.actor.displayTMR("visu");
     });
 
     // Display TMR, normal
-    html.find('#monte-tmr').click((event) => {
+    html.find('.monte-tmr').click(async event => {
       this.actor.displayTMR("normal");
     });
 
     // Display TMR, fast 
-    html.find('#monte-tmr-rapide').click((event) => {
+    html.find('.monte-tmr-rapide').click(async event => {
       this.actor.displayTMR("rapide");
     });
 
-    html.find('#dormir-une-heure').click((event) => {
+    html.find('.dormir-une-heure').click(async event => {
       this.actor.dormir(1);
     });
-    html.find('#dormir-chateau-dormant').click((event) => {
+    html.find('.dormir-chateau-dormant').click(async event => {
       this.actor.dormirChateauDormant();
     });
-    html.find('#enlever-tous-effets').click((event) => {
+    html.find('.enlever-tous-effets').click(async event => {
       this.actor.enleverTousLesEffets();
     });
-    // Display info about queue
-    html.find('.queuesouffle-label a').click((event) => {
-      let myID = event.currentTarget.attributes['data-item-id'].value;
-      const item = this.actor.getOwnedItem(myID);
-      item.sheet.render(true);
-    });
-    // Info sort
-    html.find('.sort-label a').click((event) => {
-      let myID = event.currentTarget.attributes['data-id'].value;
-      const item = this.actor.getOwnedItem(myID);
-      item.sheet.render(true);
-    });
-    // Info sort
-    html.find('.case-label a').click((event) => {
-      let myID = event.currentTarget.attributes['data-id'].value;
-      const item = this.actor.getOwnedItem(myID);
-      item.sheet.render(true);
-    });
-
-    // Display info about queue
-    html.find('.conteneur-name a').click((event) => {
+    html.find('.conteneur-name a').click(async event => {
       let myID = event.currentTarget.attributes['data-item-id'].value;
       RdDUtility.toggleAfficheContenu(myID);
       this.render(true);
     });
-
+    html.find('.carac-xp-augmenter').click(async event => {
+      let caracName = event.currentTarget.name.replace("augmenter.", "");
+      this.actor.updateCaracXPAuto(caracName);
+    });
+    html.find('.competence-xp-augmenter').click(async event => {
+      let compName = event.currentTarget.attributes.compname.value;
+      this.actor.updateCompetenceXPAuto(compName);
+    });
+    
     if (this.options.editCaracComp) {
       // On carac change
-      html.find('.carac-value').change((event) => {
+      html.find('.carac-value').change(async event => {
         let caracName = event.currentTarget.name.replace(".value", "").replace("data.carac.", "");
         //console.log("Value changed :", event, caracName);
         this.actor.updateCarac(caracName, parseInt(event.target.value));
       });
-      html.find('.carac-xp').change((event) => {
+      html.find('.carac-xp').change(async event => {
         let caracName = event.currentTarget.name.replace(".xp", "").replace("data.carac.", "");
         //console.log("Value changed :", event, caracName);
         this.actor.updateCaracXP(caracName, parseInt(event.target.value));
       });
       // On competence change
-      html.find('.competence-value').change((event) => {
+      html.find('.competence-value').change(async event => {
         let compName = event.currentTarget.attributes.compname.value;
         //console.log("Competence changed :", compName);
         this.actor.updateCompetence(compName, parseInt(event.target.value));
       });
       // On competence xp change
-      html.find('.competence-xp').change((event) => {
+      html.find('.competence-xp').change(async event => {
         let compName = event.currentTarget.attributes.compname.value;
         this.actor.updateCompetenceXP(compName, parseInt(event.target.value));
       });
       // On competence xp change
-      html.find('.competence-xp-sort').change((event) => {
+      html.find('.competence-xp-sort').change(async event => {
         let compName = event.currentTarget.attributes.compname.value;
         this.actor.updateCompetenceXPSort(compName, parseInt(event.target.value));
       });
       // On competence archetype change
-      html.find('.competence-archetype').change((event) => {
+      html.find('.competence-archetype').change(async event => {
         let compName = event.currentTarget.attributes.compname.value;
         this.actor.updateCompetenceArchetype(compName, parseInt(event.target.value));
       });
     }
-
-    // Gestion du bouton lock/unlock
-    html.find('.lock-unlock-sheet').click((event) => {
+    
+    html.find('#show-hide-competences').click(async event => {
+      this.options.showCompNiveauBase = !this.options.showCompNiveauBase;
+      this.render(true);
+    });
+    html.find('.lock-unlock-sheet').click(async event => {
       this.options.editCaracComp = !this.options.editCaracComp;
       this.render(true);
     });
-    html.find('#show-hide-archetype').click((event) => {
+    html.find('#show-hide-archetype').click(async event => {
       this.options.montrerArchetype = !this.options.montrerArchetype;
       this.render(true);
     });
+    html.find('.lock-unlock-controls').click(async event => {
+      this.options.hideControls = !this.options.hideControls;
+      this.render(true);
+    });
 
     // On pts de reve change
-    html.find('.pointsreve-value').change((event) => {
+    html.find('.pointsreve-value').change(async event => {
       let reveValue = event.currentTarget.value;
-      let reve = duplicate(this.actor.data.data.reve.reve);
-      reve.value = reveValue;
-      this.actor.update({ "data.reve.reve": reve });
+      this.actor.update({ "data.reve.reve.value": reveValue });
     });
 
     // On seuil de reve change
-    html.find('.seuil-reve-value').change((event) => {
+    html.find('.seuil-reve-value').change(async event => {
       console.log("seuil-reve-value", event.currentTarget)
       this.actor.setPointsDeSeuil(event.currentTarget.value);
     });
 
-    html.find('#attribut-protection-edit').change((event) => {
-      this.actor.updateProtectionValue(event.currentTarget.attributes.name.value, parseInt(event.target.value));
+    html.find('#attribut-protection-edit').change(async event => {
+      this.actor.updateAttributeValue(event.currentTarget.attributes.name.value, parseInt(event.target.value));
     });
 
     // On stress change
-    html.find('.compteur-edit').change((event) => {
+    html.find('.compteur-edit').change(async event => {
       let fieldName = event.currentTarget.attributes.name.value;
       this.actor.updateCompteurValue(fieldName, parseInt(event.target.value));
     });
 
-    html.find('#ethylisme').change((event) => {
+    html.find('#ethylisme').change(async event => {
       this.actor.setEthylisme(parseInt(event.target.value));
     });
-    html.find('#stress-test').click((event) => {
+    html.find('.stress-test').click(async event => {
       this.actor.transformerStress();
-      this.render(true);
     });
-    html.find('#moral-malheureux').click((event) => {
+    html.find('.moral-malheureux').click(async event => {
       this.actor.jetDeMoral('malheureuse');
-      this.render(true);
     });
-    html.find('#moral-neutre').click((event) => {
+    html.find('.moral-neutre').click(async event => {
       this.actor.jetDeMoral('neutre');
-      this.render(true);
     });
-    html.find('#moral-heureux').click((event) => {
+    html.find('.moral-heureux').click(async event => {
       this.actor.jetDeMoral('heureuse');
-      this.render(true);
     });
-    html.find('#ethylisme-test').click((event) => {
-      this.actor.ethylismeTest();
-      this.render(true);
+    html.find('#ethylisme-test').click(async event => {
+      this.actor.jetEthylisme();
     });
 
-    html.find('#jet-vie').click((event) => {
+    html.find('#jet-vie').click(async event => {
       this.actor.jetVie();
-      this.render(true);
     });
-    html.find('#jet-endurance').click((event) => {
+    html.find('#jet-endurance').click(async event => {
       this.actor.jetEndurance();
-      this.render(true);
     });
 
-    html.find('.monnaie-plus').click((event) => {
+    html.find('.monnaie-plus').click(async event => {
       const li = $(event.currentTarget).parents(".item");
       this.actor.monnaieIncDec(li.data("item-id"), 1);
-      this.render(true);
     });
-    html.find('.monnaie-moins').click((event) => {
+    html.find('.monnaie-moins').click(async event => {
       const li = $(event.currentTarget).parents(".item");
       this.actor.monnaieIncDec(li.data("item-id"), -1);
-      this.render(true);
     });
 
-    html.find('#vie-plus').click((event) => {
+    html.find('#vie-plus').click(async event => {
       this.actor.santeIncDec("vie", 1);
-      this.render(true);
     });
-    html.find('#vie-moins').click((event) => {
+    html.find('#vie-moins').click(async event => {
       this.actor.santeIncDec("vie", -1);
-      this.render(true);
     });
-    html.find('#endurance-plus').click((event) => {
+    html.find('#endurance-plus').click(async event => {
       this.actor.santeIncDec("endurance", 1);
-      this.render(true);
     });
-    html.find('#endurance-moins').click((event) => {
+    html.find('#endurance-moins').click(async event => {
       this.actor.santeIncDec("endurance", -1);
-      this.render(true);
     });
-    html.find('.data-sante-sonne').click((event) => {
+    html.find('.data-sante-sonne').click(async event => {
       this.actor.setSonne(event.currentTarget.checked);
-      this.render(true);
     });
-    html.find('#ptreve-actuel-plus').click((event) => {
+    html.find('#ptreve-actuel-plus').click(async event => {
       this.actor.reveActuelIncDec(1);
-      this.render(true);
     });
-    html.find('#ptreve-actuel-moins').click((event) => {
+    html.find('#ptreve-actuel-moins').click(async event => {
       this.actor.reveActuelIncDec(-1);
-      this.render(true);
     });
-    html.find('#fatigue-plus').click((event) => {
+    html.find('#fatigue-plus').click(async event => {
       this.actor.santeIncDec("fatigue", 1);
-      this.render(true);
     });
-    html.find('#fatigue-moins').click((event) => {
+    html.find('#fatigue-moins').click(async event => {
       this.actor.santeIncDec("fatigue", -1);
-      this.render(true);
     });
   }
 
@@ -569,8 +538,10 @@ export class RdDActorSheet extends ActorSheet {
   /** @override */
   setPosition(options = {}) {
     const position = super.setPosition(options);
+    const sheetHeader = this.element.find(".sheet-header");
+    const sheetTabs = this.element.find(".sheet-tabs");
     const sheetBody = this.element.find(".sheet-body");
-    const bodyHeight = position.height - 192;
+    const bodyHeight = position.height - sheetHeader[0].clientHeight - sheetTabs[0].clientHeight;
     sheetBody.css("height", bodyHeight);
     return position;
   }
@@ -582,4 +553,19 @@ export class RdDActorSheet extends ActorSheet {
     // Update the Actor
     return this.object.update(formData);
   }
+
+  async splitItem(item) {
+    const dialog = await DialogSplitItem.create(item, (item, split) => this._onSplitItem(item, split));
+    dialog.render(true);
+  }
+
+  async _onSplitItem(item, split) {
+    if (split >= 1 && split < Misc.data(item).data.quantite) {
+      await item.diminuerQuantite(split);
+      const itemData = duplicate( Misc.data(item));
+      itemData.data.quantite = split;
+      await this.actor.createEmbeddedDocuments('Item', [itemData])
+    }
+  }
+
 }

module/actor-vehicule-sheet.js

@@ -33,28 +33,59 @@ export class RdDActorVehiculeSheet extends ActorSheet {
   }
 
   /* -------------------------------------------- */
-  getData() {
-    let data = super.getData();
+  async getData() {
+    const objectData = Misc.data(this.object);
+    let formData = {
+      title: this.title,
+      id: objectData.id,
+      type: objectData.type,
+      img: objectData.img,
+      name: objectData.name,
+      editable: this.isEditable,
+      cssClass: this.isEditable ? "editable" : "locked",
+      data: foundry.utils.deepClone(Misc.templateData(this.object)),
+      effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
+      limited: this.object.limited,
+      options: this.options,
+      owner: this.document.isOwner,
+      itemsByType: Misc.classify(this.object.items.map(i => foundry.utils.deepClone(i.data))),
+    };
 
-    data.itemsByType = Misc.classify(data.items);
+    RdDUtility.filterItemsPerTypeForSheet(formData);
+    this.objetVersConteneur = RdDUtility.buildArbreDeConteneurs(formData.conteneurs, formData.objets);
+    formData.conteneurs = RdDUtility.conteneursRacine(formData.conteneurs);
 
-    RdDUtility.filterItemsPerTypeForSheet(data);
-    RdDUtility.buildArbreDeConteneur(this, data);
+    formData.options.isGM = game.user.isGM;
 
-    this.actor.computeEncombrementTotalEtMalusArmure();    
-    data.data.isGM = game.user.isGM;
-    data.data.surEncombrementMessage = (this.encTotal > data.capacite_encombrement) ? "Sur-Encombrement!" : "";
+    formData.calc ={
+      encTotal: await this.actor.computeEncombrementTotalEtMalusArmure(),
+    }
+    formData.calc.surEncombrementMessage = formData.calc.encTotal > formData.data.capacite_encombrement ? "Sur-Encombrement!" : "",
 
-    console.log("DATA", data);
+    console.log("DATA", formData);
 
-    return data;
+    return formData;
   }
   
   /* -------------------------------------------- */
-  async _onDrop(event) {
-    let toSuper = await RdDUtility.processItemDropEvent(this, event);
-    if ( toSuper) {
-      super._onDrop(event);
+  async _onDropItem(event, dragData) {
+    const callSuper = await this.actor.processDropItem(event, dragData, this.objetVersConteneur);
+    if (callSuper) {
+      await super._onDropItem(event, dragData)
+    }
+  }
+
+  /* -------------------------------------------- */
+  async createItem(name, type) {
+    await this.actor.createEmbeddedDocuments('Item', [{ name: name, type: type }], { renderSheet: true });
+  }
+
+  /* -------------------------------------------- */
+  async monnaieIncDec(id, value) {
+    let monnaie = this.getMonnaie(id);
+    if (monnaie) {
+      const quantite = Math.max(0, Misc.templateData(monnaie).quantite + value);
+      await this.updateEmbeddedDocuments('Item', [{ _id: monnaie.id, 'data.quantite': quantite }]);
     }
   }
 
@@ -71,7 +102,7 @@ export class RdDActorVehiculeSheet extends ActorSheet {
     // Update Inventory Item
     html.find('.item-edit').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
-      const item = this.actor.getOwnedItem(li.data("itemId"));
+      const item = this.actor.getEmbeddedDocument('Item', li.data("itemId"));
       item.sheet.render(true);
     });
     // Delete Inventory Item
@@ -80,6 +111,22 @@ export class RdDActorVehiculeSheet extends ActorSheet {
       RdDUtility.confirmerSuppression(this, li);
     });
 
+    html.find('.creer-un-objet').click(async event => {
+      RdDUtility.selectObjetType( this );
+    });
+    html.find('#nettoyer-conteneurs').click(async event => {
+      this.actor.nettoyerConteneurs();
+    });
+
+    html.find('.monnaie-plus').click(async event => {
+      const li = $(event.currentTarget).parents(".item");
+      this.actor.monnaieIncDec(li.data("item-id"), 1);
+    });
+    html.find('.monnaie-moins').click(async event => {
+      const li = $(event.currentTarget).parents(".item");
+      this.actor.monnaieIncDec(li.data("item-id"), -1);
+    });
+
     // Display info about queue
     html.find('.conteneur-name a').click((event) => {
       let myID = event.currentTarget.attributes['data-item-id'].value;
@@ -91,10 +138,12 @@ export class RdDActorVehiculeSheet extends ActorSheet {
   
   /* -------------------------------------------- */
   /** @override */
-  setPosition(options={}) {
+  setPosition(options = {}) {
     const position = super.setPosition(options);
+    const sheetHeader = this.element.find(".sheet-header");
+    const sheetTabs = this.element.find(".sheet-tabs");
     const sheetBody = this.element.find(".sheet-body");
-    const bodyHeight = position.height - 192;
+    const bodyHeight = position.height - sheetHeader[0].clientHeight - sheetTabs[0].clientHeight;
     sheetBody.css("height", bodyHeight);
     return position;
   }

module/chat-utility.js

@@ -1,3 +1,4 @@
+import { Misc } from "./misc.js";
 
 /**
  * Class providing helper methods to get the list of users, and 
@@ -7,32 +8,40 @@ export class ChatUtility {
   /* -------------------------------------------- */
   static onSocketMessage(sockmsg) {
     switch (sockmsg.msg) {
-      case "msg_delete_chat_message": return ChatUtility.onRemoveMessages(sockmsg.part, sockmsg.gmId);
+      case "msg_delete_chat_message": return ChatUtility.onRemoveMessages(sockmsg.data);
     }
   }
 
   /* -------------------------------------------- */
-  static onRemoveMessages(part, gmId) {
-    if (game.user._id == gmId) {
-      const toDelete = game.messages.filter(it => it.data.content.includes(part));
-      toDelete.forEach(it => it.delete());
+  static onRemoveMessages(data) {
+    if (Misc.isElectedUser()) {
+      if (data.part) {
+        const toDelete = game.messages.filter(it => it.data.content.includes(data.part));
+        toDelete.forEach(it => it.delete());
+      }
+      if (data.messageId) {
+        game.messages.get(data.messageId)?.delete();
+      }
     }
+  }
 
-   }
-  
-  /* -------------------------------------------- */
-  static removeChatMessageContaining(part) {
-    const gmId = game.user.isGM ? game.user._id : game.users.entities.find(u => u.isGM)?.id;
-
-    if (!gmId || game.user.isGM) {
-      ChatUtility.onRemoveMessages(part, game.user._id);
+  static removeMessages(data) {
+    if (Misc.isElectedUser()){
+      ChatUtility.onRemoveMessages(data);
     }
     else {
-      game.socket.emit("system.foundryvtt-reve-de-dragon", {
-        msg: "msg_delete_chat_message", data: {
-          part:part,
-          gmId: gmId,
-        }});
+      game.socket.emit("system.foundryvtt-reve-de-dragon", { msg: "msg_delete_chat_message", data: data });
+    }
+  }
+
+  /* -------------------------------------------- */
+  static removeChatMessageContaining(part) {
+    ChatUtility.removeMessages({ part: part });
+  }
+
+  static removeChatMessageId(messageId) {
+    if (messageId){
+      ChatUtility.removeMessages({ messageId: messageId });
     }
   }
 
@@ -48,7 +57,7 @@ export class ChatUtility {
         if (!game.user.isGM) {
           ChatUtility.blindMessageToGM(chatOptions);
 
-          chatOptions.whisper = [game.user._id];
+          chatOptions.whisper = [game.user.id];
           chatOptions.content = "Message envoyé en aveugle au Gardien";
         }
         else {
@@ -66,7 +75,7 @@ export class ChatUtility {
   /* -------------------------------------------- */
   static prepareChatMessage(rollMode, name) {
     return {
-      user: game.user._id,
+      user: game.user.id,
       whisper: ChatUtility.getWhisperRecipients(rollMode, name)
     }
   }
@@ -76,7 +85,7 @@ export class ChatUtility {
     switch (rollMode) {
       case "blindroll": return ChatUtility.getUsers(user => user.isGM);
       case "gmroll": return ChatUtility.getWhisperRecipientsAndGMs(name);
-      case "selfroll": return [game.user._id];
+      case "selfroll": return [game.user.id];
     }
     return undefined;
   }
@@ -105,9 +114,9 @@ export class ChatUtility {
   static handleGMChatMessage(data) {
     console.log("blindMessageToGM", data);
     if (game.user.isGM) { // message privé pour GM only
-      data.user = game.user._id;
+      data.user = game.user.id;
       ChatMessage.create(data);
     }
   }
-  
+
 }

module/constants.js

@@ -0,0 +1 @@
+export const SYSTEM_RDD = "foundryvtt-reve-de-dragon";

module/de-draconique.js

@@ -1,27 +0,0 @@
-import { RdDDice } from "./rdd-dice.js";
-
-export class DeDraconique extends Roll{
-
-  static async ddr(rollMode=undefined) {
-    let ddr = new DeDraconique().evaluate();
-    await RdDDice.show(ddr, rollMode);
-    return ddr;
-  }
-
-  constructor(){
-    super("1d8x8 - 0")
-  }
-
-  evaluate() {
-    super.evaluate();
-    const rerolls = Math.ceil(this.total / 8);
-    this.terms[this.terms.length - 1] = rerolls;
-    this.results[this.results.length - 1] = rerolls;
-    this._total -= rerolls;
-    return this;
-  }
-
-  async render(chatOptions) {
-    return super.render(chatOptions)
-  }
-}

module/dialog-create-signedraconique.js

@@ -0,0 +1,119 @@
+import { ChatUtility } from "./chat-utility.js";
+import { HtmlUtility } from "./html-utility.js";
+import { RdDItemSigneDraconique } from "./item-signedraconique.js";
+import { Misc } from "./misc.js";
+import { RdDRollTables } from "./rdd-rolltables.js";
+import { TMRType, TMRUtility } from "./tmr-utility.js";
+
+export class DialogCreateSigneDraconique extends Dialog {
+
+  static async createSigneForActors() {
+    const signe = await RdDItemSigneDraconique.randomSigneDraconique({ephemere: true});
+    let dialogData = {
+      signe: signe,
+      tmrs: TMRUtility.listSelectedTMR(signe.data.typesTMR ?? []),
+      actors: game.actors.filter(actor => actor.isHautRevant()).map(actor => {
+        let actorData = duplicate(Misc.data(actor));
+        actorData.selected = actor.hasPlayerOwner;
+        return actorData;
+      })
+    };
+
+    const html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/dialog-create-signedraconique.html", dialogData);
+    new DialogCreateSigneDraconique(dialogData, html)
+      .render(true);
+  }
+
+  constructor(dialogData, html, callback) {
+    let options = { classes: ["DialogCreateSigneDraconiqueActorsActors"], width: 500, height: 650, 'z-index': 99999 };
+    let conf = {
+      title: "Créer un signe",
+      content: html,
+      default: "Ajouter aux haut-rêvants",
+      buttons: {
+        "Ajouter aux haut-rêvants": { label: "Ajouter aux haut-rêvants", callback: it => { this._onCreerSigneActeurs(); } }
+      }
+    };
+    super(conf, options);
+    this.dialogData = dialogData;
+  }
+
+  async _onCreerSigneActeurs() {
+    await $("[name='signe.data.ephemere']").change();
+    await $(".signe-xp-sort").change();
+    this.validerSigne();
+    this.dialogData.actors.filter(it => it.selected).map(it => game.actors.get(it._id))
+      .forEach(actor => this._createSigneForActor(actor, this.dialogData.signe));
+  }
+
+  async _createSigneForActor(actor, signe) {
+    actor.createEmbeddedDocuments("Item", [signe]);
+    ChatMessage.create({
+      whisper: ChatUtility.getWhisperRecipientsAndGMs(Misc.data(actor).name),
+      content: await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/chat-signe-draconique-actor.html", {
+        signe: signe,
+        alias: Misc.data(actor).name
+      })
+    });
+  }
+
+  validerSigne() {
+    this.dialogData.signe.name = $("[name='signe.name']").val();
+    this.dialogData.signe.data.valeur.norm = $("[name='signe.data.valeur.norm']").val();
+    this.dialogData.signe.data.valeur.sign = $("[name='signe.data.valeur.sign']").val();
+    this.dialogData.signe.data.valeur.part = $("[name='signe.data.valeur.part']").val();
+    this.dialogData.signe.data.difficulte = $("[name='signe.data.difficulte']").val();
+    this.dialogData.signe.data.ephemere = $("[name='signe.data.ephemere']").prop("checked");
+    this.dialogData.signe.data.duree = $("[name='signe.data.duree']").val();
+    this.dialogData.signe.data.typesTMR = $(".select-tmr").val();
+  }
+
+  /* -------------------------------------------- */
+  activateListeners(html) {
+    super.activateListeners(html);
+    this.setEphemere(this.dialogData.signe.data.ephemere);
+    html.find(".signe-aleatoire").click(event => this.setSigneAleatoire());
+    html.find("[name='signe.data.ephemere']").change((event) => this.setEphemere(event.currentTarget.checked));
+    html.find(".select-actor").change((event) => this.onSelectActor(event));
+    html.find(".signe-xp-sort").change((event) => this.onValeurXpSort(event));
+  }
+
+  async setSigneAleatoire() {
+    const newSigne = await RdDItemSigneDraconique.randomSigneDraconique({ephemere: true});
+
+    $("[name='signe.name']").val(newSigne.name);
+    $("[name='signe.data.valeur.norm']").val(newSigne.data.valeur.norm);
+    $("[name='signe.data.valeur.sign']").val(newSigne.data.valeur.sign);
+    $("[name='signe.data.valeur.part']").val(newSigne.data.valeur.part);
+    $("[name='signe.data.difficulte']").val(newSigne.data.difficulte);
+    $("[name='signe.data.duree']").val(newSigne.data.duree);
+    $("[name='signe.data.ephemere']").prop("checked", newSigne.data.ephemere);
+    $(".select-tmr").val(newSigne.data.typesTMR);
+    this.setEphemere(newSigne.data.ephemere);
+  }
+
+  async setEphemere(ephemere) {
+    this.dialogData.signe.data.ephemere = ephemere;
+    HtmlUtility._showControlWhen($(".signe-data-duree"), ephemere);
+  }
+
+  async onSelectActor(event) {
+    event.preventDefault();
+    const options = event.currentTarget.options;
+    for (var i = 0; i < options.length; i++) { // looping over the options
+      const actorId = options[i].attributes["data-actor-id"].value;
+      const actor = this.dialogData.actors.find(it => it._id == actorId);
+      if (actor) {
+        actor.selected = options[i].selected;
+      }
+    };
+  }
+
+  onValeurXpSort(event) {
+    const codeReussite = event.currentTarget.attributes['data-typereussite']?.value ?? 0;
+    const xp = Number(event.currentTarget.value);
+    const oldValeur = this.dialogData.signe.data.valeur;
+    this.dialogData.signe.data.valeur = RdDItemSigneDraconique.calculValeursXpSort(codeReussite, xp, oldValeur);
+  }
+
+}

module/dialog-fabriquer-potion.js

@@ -0,0 +1,71 @@
+import { Grammar } from "./grammar.js";
+import { Misc } from "./misc.js";
+import { RdDUtility } from "./rdd-utility.js";
+
+export class DialogFabriquerPotion extends Dialog {
+
+  /* -------------------------------------------- */
+  static async create(actor, item, dialogConfig) {
+    let potionData = DialogFabriquerPotion.prepareData(actor, item);
+
+    let conf = {
+      title: `Fabriquer une potion de ${potionData.data.categorie}`,
+      content: await renderTemplate(dialogConfig.html, potionData),
+      default: potionData.buttonName,
+    };
+
+    let options = { classes: ["dialogfabriquerpotion"], width: 600, height: 160, 'z-index': 99999 };
+    mergeObject(options, dialogConfig.options ?? {}, { overwrite: true })
+
+    const dialog = new DialogFabriquerPotion(actor, potionData, conf, options);
+    dialog.render(true);
+    return dialog;
+  }
+
+  /* -------------------------------------------- */
+  static prepareData(actor, item) {
+    let potionData = duplicate(Misc.data(item));
+    potionData.nbBrinsSelect = RdDUtility.buildListOptions(1, potionData.data.quantite);
+    potionData.nbBrins = Math.min(potionData.data.quantite, DialogFabriquerPotion.getNombreBrinOptimal(potionData));
+    potionData.buttonName = "Fabriquer";
+    return potionData;
+  }
+
+  /* -------------------------------------------- */
+  constructor(actor, potionData, conf, options) {
+    conf.buttons = {
+      [potionData.buttonName]: {
+        label: potionData.buttonName, callback: it => this.onFabriquer(it)
+      }
+    };
+
+    super(conf, options);
+
+    this.actor = actor;
+    this.potionData = potionData;
+  }
+
+  static getNombreBrinOptimal(herbeData) {
+    switch (herbeData.data.categorie ?? '') {
+      case "Soin": return 12 - herbeData.data.niveau;
+      case "Repos": return 7 - herbeData.data.niveau;
+    }
+    return 1;
+  }
+
+  /* -------------------------------------------- */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    html.find("#nbBrins").change(event => {
+      this.potionData.nbBrins = Misc.toInt(event.currentTarget.value);
+    });
+  }
+
+  /* -------------------------------------------- */
+  async onFabriquer(it) {
+    await $("#nbBrins").change();
+    this.actor.fabriquerPotion(this.potionData);
+    this.close();
+  }
+}

module/dialog-item-achat.js

@@ -0,0 +1,95 @@
+
+import { Misc } from "./misc.js";
+import { RdDUtility } from "./rdd-utility.js";
+
+export class DialogItemAchat extends Dialog {
+
+  static async onButtonAcheter(event) {
+    const buttonAcheter = event.currentTarget;
+    if (!buttonAcheter.attributes['data-jsondata']?.value) {
+      ui.notifications.warn("Impossible d'acheter: informations sur l'objet manquantes")
+      return;
+    }
+    const chatMessageIdVente = RdDUtility.findChatMessageId(buttonAcheter);
+
+    const vendeurId = buttonAcheter.attributes['data-vendeurId']?.value;
+    const vendeur = vendeurId ? game.actors.get(vendeurId) : undefined;
+    const acheteur = RdDUtility.getSelectedActor();
+
+    if (!acheteur && !vendeur) {
+      ui.notifications.info("Pas d'acheteur ni de vendeur, aucun changement");
+      return;
+    }
+
+    let venteData = DialogItemAchat.prepareVenteData(buttonAcheter, vendeurId, vendeur, acheteur);
+    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-achat.html`, venteData);
+    const dialog = new DialogItemAchat(html, vendeur, acheteur, venteData, chatMessageIdVente);
+    dialog.render(true);
+  }
+
+  constructor(html, vendeur, acheteur, venteData, chatMessageIdVente) {
+    let options = { classes: ["dialogachat"], width: 400, height: 300, 'z-index': 99999 };
+
+    const actionAchat = venteData.prixLot > 0 ? "Acheter" : "Prendre";
+    let conf = {
+      title: actionAchat,
+      content: html,
+      default: actionAchat,
+      buttons: {
+        [actionAchat]: { label: actionAchat, callback: it => { this.onAchat(); } },
+        "decliner": { label: "Décliner", callback: it => { } }
+      }
+    };
+
+    super(conf, options);
+
+    this.vendeur = vendeur;
+    this.acheteur = acheteur;
+    this.chatMessageIdVente = chatMessageIdVente;
+    this.venteData = venteData;
+  }
+
+  static prepareVenteData(buttonAcheter, vendeurId, vendeur, acheteur) {
+    const jsondata = buttonAcheter.attributes['data-jsondata']?.value;
+    const prixLot = buttonAcheter.attributes['data-prixLot']?.value ?? 0;
+    let venteData = {
+      item: JSON.parse(jsondata),
+      vendeurId: vendeurId,
+      vendeur: Misc.data(vendeur),
+      acheteur: Misc.data(acheteur),
+      tailleLot: parseInt(buttonAcheter.attributes['data-tailleLot']?.value ?? 1),
+      quantiteIllimite: buttonAcheter.attributes['data-quantiteIllimite']?.value == 'true',
+      quantiteNbLots: parseInt(buttonAcheter.attributes['data-quantiteNbLots']?.value),
+      nombreLots: 1,
+      prixLot: prixLot,
+      prixTotal: prixLot,
+      isVente: prixLot > 0
+    };
+    return venteData;
+  }
+
+  async onAchat() {
+    await $(".nombreLots").change();
+    (this.vendeur ?? this.acheteur).achatVente({
+      vendeurId: this.vendeur?.id,
+      acheteurId: this.acheteur?.id,
+      nombreLots: this.venteData.nombreLots,
+      prixTotal: this.venteData.prixTotal,
+      chatMessageIdVente: this.chatMessageIdVente
+    });
+  }
+
+  /* -------------------------------------------- */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    html.find(".nombreLots").change(event => this.setNombreLots(Number(event.currentTarget.value)));
+  }
+
+  setNombreLots(nombreLots) {
+    this.venteData.nombreLots = nombreLots;
+    this.venteData.prixTotal = (nombreLots * this.venteData.prixLot).toFixed(2);
+    $(".prixTotal").text(this.venteData.prixTotal);
+  }
+
+}

module/dialog-item-consommer.js

@@ -0,0 +1,90 @@
+import { Misc } from "./misc.js";
+
+export class DialogConsommer extends Dialog {
+
+  static async create(actor, item, template = undefined, options = {}) {
+    const consommerData = DialogConsommer.prepareData(actor, item, options);
+    const html = await renderTemplate(template ?? `systems/foundryvtt-reve-de-dragon/templates/dialog-item-consommer.html`, consommerData);
+    return new DialogConsommer(actor, item, consommerData, html, options)
+  }
+
+  constructor(actor, item, consommerData, html, options = {}) {
+    mergeObject(options, { classes: ["dialogconsommer"], width: 350, height: 450, 'z-index': 99999 }, { overwrite: false })
+
+    let conf = {
+      title: consommerData.title,
+      content: html,
+      default: consommerData.buttonName,
+      buttons: {
+        [consommerData.buttonName]: {
+          label: consommerData.buttonName, callback: it => this.onConsommer(it)
+        }
+      }
+    };
+
+    super(conf, options);
+
+    this.actor = actor;
+    this.item = item;
+    this.consommerData = consommerData;
+  }
+
+  async onConsommer(event) {
+    await $(".se-forcer").change();
+    await $(".consommer-doses").change();
+    this.actor.consommer(this.item, this.consommerData.choix);
+  }
+
+  /* -------------------------------------------- */
+  static prepareData(actor, item, options) {
+    const itemData = duplicate(Misc.data(item));
+    let consommerData = {
+      item: itemData,
+      cuisine: Misc.data(actor.getCompetence('cuisine')),
+      choix: {
+        doses: options.doses ?? 1,
+        seForcer: options.seForcer ?? false,
+      }
+    }
+    switch (itemData.type) {
+      case 'nourritureboisson':
+        consommerData.title = itemData.data.boisson ? `${itemData.name}: boire une dose` : `${itemData.name}: manger une portion`;
+        consommerData.buttonName = itemData.data.boisson ? "Boire" : "Manger";
+        break;
+      case 'potion':
+        consommerData.title = `${itemData.name}: boire la potion`;
+        consommerData.buttonName = "Boire";
+        break;
+    }
+    DialogConsommer.calculDoses(consommerData, consommerData.choix.doses)
+    return consommerData;
+  }
+
+  static calculDoses(consommerData) {
+    const doses = consommerData.choix.doses;
+    consommerData.totalSust = Misc.keepDecimals(doses * (consommerData.item.data.sust ?? 0), 2);
+    consommerData.totalDesaltere = consommerData.item.data.boisson
+      ? Misc.keepDecimals(doses * (consommerData.item.data.desaltere ?? 0), 2)
+      : 0;
+  }
+
+
+  /* -------------------------------------------- */
+  activateListeners(html) {
+    super.activateListeners(html);
+    html.find(".se-forcer").change(event => this.setSeForcer(event));
+    html.find(".consommer-doses").change(event => this.selectDoses(event));
+  }
+
+
+  setSeForcer(event) {
+    this.consommerData.choix.seForcer = event.currentTarget.checked;
+  }
+
+  selectDoses(event) {
+    this.consommerData.choix.doses = Number(event.currentTarget.value);
+    DialogConsommer.calculDoses(this.consommerData);
+    $(".total-sust").text(this.consommerData.totalSust);
+    $(".total-desaltere").text(this.consommerData.totalDesaltere);
+  }
+}

module/dialog-item-vente.js

@@ -0,0 +1,94 @@
+import { HtmlUtility } from "./html-utility.js";
+import { Misc } from "./misc.js";
+
+export class DialogItemVente extends Dialog {
+
+  static async create(item, callback) {
+    const itemData = Misc.data(item);
+    const venteData = {
+      item: itemData,
+      alias: item.actor?.name ?? game.user.name,
+      vendeurId: item.actor?.id,
+      prixOrigine: itemData.data.cout,
+      prixUnitaire: itemData.data.cout,
+      prixLot: itemData.data.cout,
+      tailleLot: 1,
+      quantiteNbLots: itemData.data.quantite,
+      quantiteMaxLots: itemData.data.quantite,
+      quantiteMax: itemData.data.quantite,
+      quantiteIllimite: !item.isOwned,
+      isOwned: item.isOwned,
+    };
+    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-vente.html`, venteData);
+    return new DialogItemVente(venteData, html, callback);
+  }
+
+  constructor(venteData, html, callback) {
+    let options = { classes: ["dialogvente"], width: 400, height: 300, 'z-index': 99999 };
+
+    let conf = {
+      title: "Proposer",
+      content: html,
+      default: "proposer",
+      buttons: { "proposer": { label: "Proposer", callback: it => { this.onProposer(it); } } }
+    };
+
+    super(conf, options);
+    this.callback = callback;
+    this.venteData = venteData;
+  }
+
+  async onProposer(it) {
+    await $(".tailleLot").change();
+    await $(".quantiteNbLots").change();
+    await $(".quantiteIllimite").change();
+    await $(".prixLot").change();
+    this.callback(this.venteData);
+  }
+
+  /* -------------------------------------------- */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    HtmlUtility._showControlWhen($(".quantiteNbLots"), !this.venteData.quantiteIllimite)
+
+    html.find(".tailleLot").change(event => this.setTailleLot(Number(event.currentTarget.value)));
+    html.find(".quantiteNbLots").change(event => this.setNbLots(Number(event.currentTarget.value)));
+    html.find(".quantiteIllimite").change(event => this.setQuantiteIllimite(event.currentTarget.checked));
+    html.find(".prixLot").change(event => this.setPrixLot(Number(event.currentTarget.value)));
+  }
+
+  setPrixLot(prixLot) {
+    this.venteData.prixLot = prixLot;
+  }
+
+  setTailleLot(tailleLot) {
+    // recalculer le prix du lot
+    if (tailleLot != this.venteData.tailleLot) {
+      this.venteData.prixLot = (tailleLot * this.venteData.prixOrigine).toFixed(2);
+      $(".prixLot").val(this.venteData.prixLot);
+    }
+    this.venteData.tailleLot = tailleLot;
+    if (this.venteData.isOwned) {
+      // recalculer le nombre de lots max
+      this.venteData.quantiteMaxLots = Math.floor(this.venteData.quantiteMax / tailleLot);
+      this.venteData.quantiteNbLots = Math.min(this.venteData.quantiteMaxLots, this.venteData.quantiteNbLots);
+      $(".quantiteNbLots").val(this.venteData.quantiteNbLots);
+      $(".quantiteNbLots").attr("max", this.venteData.quantiteMaxLots)
+    }
+  }
+
+  setNbLots(nbLots) {
+    if (this.venteData.isOwned) {
+      nbLots = Math.max(0, Math.min(nbLots, this.venteData.quantiteMaxLots));
+    }
+    this.venteData.quantiteNbLots = nbLots;
+    $(".quantiteNbLots").val(this.venteData.quantiteNbLots);
+  }
+
+  setQuantiteIllimite(checked) {
+    this.venteData.quantiteIllimite = checked;
+    $(".label-quantiteIllimite").text(this.venteData.quantiteIllimite ? "Illimités" : "disponibles");
+    HtmlUtility._showControlWhen($(".quantiteNbLots"), !this.venteData.quantiteIllimite)
+  }
+}

module/dialog-split-item.js

@@ -0,0 +1,52 @@
+import { Misc } from "./misc.js";
+
+export class DialogSplitItem extends Dialog {
+
+  static async create(item, callback) {
+    const itemData = Misc.data(item);
+    const splitData = {
+      item: itemData,
+      choix: { quantite: 1, max: itemData.data.quantite - 1 }
+    };
+    const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/dialog-item-split.html`, splitData);
+    return new DialogSplitItem(item, splitData, html, callback)
+  }
+
+  constructor(item, splitData, html, callback) {
+    let options = { classes: ["dialogsplit"], width: 300, height: 160, 'z-index': 99999 };
+
+    let conf = {
+      title: "Séparer en deux",
+      content: html,
+      default: "separer",
+      buttons: {
+        "separer": {
+          label: "Séparer", callback: it => {
+            this.onSplit();
+          }
+        }
+      }
+    };
+    
+    super(conf, options);
+    
+    this.callback = callback;
+    this.item = item;
+    this.splitData = splitData;
+  }
+
+  async onSplit(){
+    await $(".choix-quantite").change();
+    this.callback(this.item, this.splitData.choix.quantite);
+  }
+
+  /* -------------------------------------------- */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    html.find(".choix-quantite").change(event => {
+      this.splitData.choix.quantite = Number(event.currentTarget.value);
+    });
+  }
+
+}

module/grammar.js

@@ -24,9 +24,14 @@ export class Grammar {
     return words?.toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/g, "") ?? words;
   }
 
+  /* -------------------------------------------- */
+  static toLowerCaseNoAccentNoSpace(words) {
+    return words?.toLowerCase().normalize("NFD").replace(/[ \u0300-\u036f]/g, "") ?? words;
+  }
+  
   /* -------------------------------------------- */
   static articleDetermine(genre) {
-    switch (toLowerCaseNoAccent(genre)) {
+    switch (Grammar.toLowerCaseNoAccent(genre)) {
       case 'f': case 'feminin': return 'la';
       case 'p': case 'mp': case 'fp': case 'pluriel': return 'les';
       default:
@@ -35,8 +40,8 @@ export class Grammar {
   }
   
   /* -------------------------------------------- */
-  static articleIndétermine(genre) {
-    switch (toLowerCaseNoAccent(genre)) {
+  static articleIndetermine(genre) {
+    switch (Grammar.toLowerCaseNoAccent(genre)) {
       case 'f': case 'feminin': return 'une';
       case 'p': case 'fp': case 'mp': case 'pluriel': return 'des';
       case 'n': case 'neutre': return 'du'
@@ -58,7 +63,7 @@ export class Grammar {
    * @param  {...any} mots 
    */
   static accord(genre, ...mots) {
-    switch (toLowerCaseNoAccent(genre)) {
+    switch (Grammar.toLowerCaseNoAccent(genre)) {
       default:
       case 'n': case 'neutre':
       case 'm': case 'masculin': return mots[0];

module/hook-renderChatLog.js

@@ -3,7 +3,7 @@ import { RdDUtility } from "./rdd-utility.js";
 
 /* -------------------------------------------- */
 // Activate chat listeners defined 
-Hooks.on('renderChatLog', (log, html, data) => {
-  RdDUtility.chatListeners(html);
-});
+// Hooks.on('renderChatLog', (log, html, data) => {
+//   RdDUtility.chatListeners(html);
+// });
 

module/item-arme.js

@@ -1,4 +1,6 @@
 import { RdDItemCompetenceCreature } from "./item-competencecreature.js"
+import { Misc } from "./misc.js";
+import { RdDCombatManager } from "./rdd-combat.js";
 
 const nomCategorieParade = {
   "sans-armes": "Sans arme / armes naturelles",
@@ -16,20 +18,33 @@ const nomCategorieParade = {
 /* -------------------------------------------- */
 export class RdDItemArme extends Item {
 
-  static isArme(item) {
-    return (item.type == 'competencecreature' && item.data.iscombat) || item.type == 'arme';
+  static isArme(itemData) {
+    itemData = Misc.data(itemData);
+    return (itemData.type == 'competencecreature' && itemData.data.iscombat) || itemData.type == 'arme';
   }
 
   /* -------------------------------------------- */
-  static getArmeData(item) {
-    switch (item ? item.data.type : '') {
-      case 'arme': return item.data;
+  static getArmeData(armeData) {
+    armeData = Misc.data(armeData);
+    switch (armeData ? armeData.type : '') {
+      case 'arme': return armeData;
       case 'competencecreature':
-        return RdDItemCompetenceCreature.toArme(item.data);
+        return RdDItemCompetenceCreature.toArme(armeData);
     }
     return RdDItemArme.mainsNues();
   }
 
+  static computeNiveauArmes(armes, competences) {
+    for (const arme of armes) {
+      arme.data.niveau = RdDItemArme.niveauCompetenceArme(arme, competences);
+    }
+  }
+
+  static niveauCompetenceArme(arme, competences) {
+    const compArme = competences.find(it => it.name == arme.data.competence);
+    return compArme?.data.niveau ?? -8;
+  }
+
   /* -------------------------------------------- */
   static getNomCategorieParade(arme) {
     const categorie = arme?.data ? RdDItemArme.getCategorieParade(arme) : arme;
@@ -38,7 +53,7 @@ export class RdDItemArme extends Item {
 
   /* -------------------------------------------- */
   static needArmeResist(armeAttaque, armeParade) {
-    if (!armeAttaque || !armeParade){
+    if (!armeAttaque || !armeParade) {
       return false;
     }
     // Epées parant une arme de bois (cf. page 115 ), une résistance est nécessaire
@@ -49,21 +64,22 @@ export class RdDItemArme extends Item {
   }
 
   /* -------------------------------------------- */
-  static getCategorieParade(arme) {
-    if (arme.data.categorie_parade) {
-      return arme.data.categorie_parade;
+  static getCategorieParade(armeData) {
+    armeData = Misc.data(armeData);
+    if (armeData.data.categorie_parade) {
+      return armeData.data.categorie_parade;
     }
     // pour compatibilité avec des personnages existants
-    if (arme.type == 'competencecreature' ||  arme.data.categorie == 'creature' ) {
-      return arme.data.categorie_parade || (arme.data.isparade ? 'sans-armes' : '');
+    if (armeData.type == 'competencecreature' || armeData.data.categorie == 'creature') {
+      return armeData.data.categorie_parade || (armeData.data.isparade ? 'sans-armes' : '');
     }
-    if (!arme.type.match(/arme|competencecreature/)) {
+    if (!armeData.type.match(/arme|competencecreature/)) {
       return '';
     }
-    if (arme.data.competence == undefined) {
+    if (armeData.data.competence == undefined) {
       return 'competencecreature';
     }
-    let compname = arme.data.competence.toLowerCase();
+    let compname = armeData.data.competence.toLowerCase();
     if (compname.match(/^(dague de jet|javelot|fouet|arc|arbalête|fronde|hache de jet|fléau)$/)) return '';
 
     if (compname.match('hache')) return 'haches';
@@ -72,9 +88,9 @@ export class RdDItemArme extends Item {
     if (compname.match('bouclier')) return 'boucliers';
     if (compname.match('masse')) return 'masses';
     if (compname.match('epée') || compname.match('épée')) {
-      if (arme.name.toLowerCase().match(/(gnome)/))
+      if (armeData.name.toLowerCase().match(/(gnome)/))
         return 'epees-courtes';
-      if (arme.name.toLowerCase().match(/((e|é)pée dragone|esparlongue|demi-dragonne)/))
+      if (armeData.name.toLowerCase().match(/((e|é)pée dragone|esparlongue|demi-dragonne)/))
         return 'epees-longues';
       return 'epees-lourdes';
     }
@@ -86,7 +102,7 @@ export class RdDItemArme extends Item {
 
   /* -------------------------------------------- */
   static needParadeSignificative(armeAttaque, armeParade) {
-    if (!armeAttaque || !armeParade){
+    if (!armeAttaque || !armeParade) {
       return false;
     }
     // categories d'armes à la parade (cf. page 115 )
@@ -96,7 +112,7 @@ export class RdDItemArme extends Item {
     if (defCategory == 'boucliers') {
       return false;
     }
-    // Parer avec une hache ou une arme d’hast exige toujours une signi$cative
+    // Parer avec une hache ou une arme d’hast exige toujours une significative
     if (defCategory.match(/(hast|haches)/)) {
       return true;
     }
@@ -119,36 +135,44 @@ export class RdDItemArme extends Item {
   }
 
   /* -------------------------------------------- */
-  static armeUneOuDeuxMains(arme, aUneMain) {
-    if (arme) {
-      arme.data.unemain = arme.data.unemain || !arme.data.deuxmains;
-      const uneOuDeuxMains = arme.data.unemain && arme.data.deuxmains;
-      const containsSlash = !Number.isInteger(arme.data.dommages) && arme.data.dommages.includes("/");
+  static armeUneOuDeuxMains(armeData, aUneMain) {
+    armeData = Misc.data(armeData);
+    if (armeData) {
+      armeData.data.unemain = armeData.data.unemain || !armeData.data.deuxmains;
+      const uneOuDeuxMains = armeData.data.unemain && armeData.data.deuxmains;
+      const containsSlash = !Number.isInteger(armeData.data.dommages) && armeData.data.dommages.includes("/");
       if (containsSlash) { // Sanity check
-        arme = duplicate(arme);
+        armeData = duplicate(armeData);
 
-        const tableauDegats = arme.data.dommages.split("/");
+        const tableauDegats = armeData.data.dommages.split("/");
         if (aUneMain)
-          arme.data.dommagesReels = Number(tableauDegats[0]);
+          armeData.data.dommagesReels = Number(tableauDegats[0]);
         else // 2 mains
-          arme.data.dommagesReels = Number(tableauDegats[1]);
+          armeData.data.dommagesReels = Number(tableauDegats[1]);
       }
       else {
-        arme.data.dommagesReels = Number(arme.data.dommages);
+        armeData.data.dommagesReels = Number(armeData.data.dommages);
       }
 
       if (uneOuDeuxMains != containsSlash) {
-        ui.notifications.info("Les dommages de l'arme à 1/2 mains " + arme.name + " ne sont pas corrects (ie sous la forme X/Y)");
+        ui.notifications.info("Les dommages de l'arme à 1/2 mains " + armeData.name + " ne sont pas corrects (ie sous la forme X/Y)");
       }
     }
-    return arme;
+    return armeData;
   }
 
-  static isArmeUtilisable(item) {
-    return item.type == 'arme' && (item.data.resistance > 0 || item.data.portee_courte>0);
+  static isArmeUtilisable(itemData) {
+    itemData = Misc.data(itemData);
+    return itemData.type == 'arme' && itemData.data.equipe && (itemData.data.resistance > 0 || itemData.data.portee_courte > 0);
   }
 
-  static mainsNues(actorData={}) {
+  static ajoutCorpsACorps(armes, competences, carac) {
+    let corpsACorps = competences.find(it => it.name == 'Corps à corps') ?? { data: { niveau: -6 } };
+    let init = RdDCombatManager.calculInitiative(corpsACorps.data.niveau, carac['melee'].value);
+    armes.push(RdDItemArme.mainsNues({ niveau: corpsACorps.data.niveau, initiative: init }));
+  }
+
+  static mainsNues(actorData = {}) {
     const mainsNues = {
       name: 'Mains nues',
       data: {
@@ -163,8 +187,8 @@ export class RdDItemArme extends Item {
       }
     };
     if (actorData) {
-      mergeObject( mainsNues.data, actorData, {overwrite:false});
+      mergeObject(mainsNues.data, actorData, { overwrite: false });
     }
     return mainsNues
   }
-}  
+}

module/item-competence.js

@@ -1,16 +1,52 @@
+import { Grammar } from "./grammar.js";
+import { Misc } from "./misc.js";
 
 const competenceTroncs = [["Esquive", "Dague", "Corps à corps"],
 ["Epée à 1 main", "Epée à 2 mains", "Hache à 1 main", "Hache à 2 mains", "Lance", "Masse à 1 main", "Masse à 2 mains"]];
 
-const competence_xp_par_niveau = [5, 5, 5, 10, 10, 10, 10, 15, 15, 15, 15, 20, 20, 20, 20, 30, 30, 40, 40, 60, 60, 100, 100, 100, 100, 100, 100, 100, 100, 100];
-const competence_niveau_max = competence_xp_par_niveau.length - 10;
+const xp_par_niveau = [5, 5, 5, 10, 10, 10, 10, 15, 15, 15, 15, 20, 20, 20, 20, 30, 30, 40, 40, 60, 60, 100, 100, 100, 100, 100, 100, 100, 100, 100];
+const niveau_max = xp_par_niveau.length - 10;
+/* -------------------------------------------- */
+const limitesArchetypes = [
+  { "niveau": 0, "nombreMax": 100, "nombre": 0 },
+  { "niveau": 1, "nombreMax": 10, "nombre": 0 },
+  { "niveau": 2, "nombreMax": 9, "nombre": 0 },
+  { "niveau": 3, "nombreMax": 8, "nombre": 0 },
+  { "niveau": 4, "nombreMax": 7, "nombre": 0 },
+  { "niveau": 5, "nombreMax": 6, "nombre": 0 },
+  { "niveau": 6, "nombreMax": 5, "nombre": 0 },
+  { "niveau": 7, "nombreMax": 4, "nombre": 0 },
+  { "niveau": 8, "nombreMax": 3, "nombre": 0 },
+  { "niveau": 9, "nombreMax": 2, "nombre": 0 },
+  { "niveau": 10, "nombreMax": 1, "nombre": 0 },
+  { "niveau": 11, "nombreMax": 1, "nombre": 0 }
+];
+
+/* -------------------------------------------- */
+const categorieCompetences = {
+  "generale": { base: -4, label: "Générales" },
+  "particuliere": { base: -8, label: "Particulières" },
+  "specialisee": { base: -11, label: "Spécialisées" },
+  "connaissance": { base: -11, label: "Connaissances" },
+  "draconic": { base: -11, label: "Draconics" },
+  "melee": { base: -6, label: "Mêlée" },
+  "tir": { base: -8, label: "Tir" },
+  "lancer": { base: -8, label: "Lancer" }
+}
+
+const compendiumCompetences = {
+  "personnage": "foundryvtt-reve-de-dragon.competences",
+  "creature": "foundryvtt-reve-de-dragon.competences-creatures",
+  "entite": "foundryvtt-reve-de-dragon.competences-entites"
+};
+
 
 function _buildCumulXP() {
   let cumulXP = { "-11": 0 };
   let cumul = 0;
-  for (let i = 0; i <= competence_xp_par_niveau.length; i++) {
+  for (let i = 0; i <= xp_par_niveau.length; i++) {
     let level = i - 10;
-    cumul += competence_xp_par_niveau[i];
+    cumul += xp_par_niveau[i];
     cumulXP[level] = cumul;
   }
   return cumulXP;
@@ -20,11 +56,48 @@ const competence_xp_cumul = _buildCumulXP();
 
 export class RdDItemCompetence extends Item {
 
+  /* -------------------------------------------- */
+  static actorCompendium(actorType) {
+    return compendiumCompetences[actorType];
+  }
+
+  /* -------------------------------------------- */
+  static getCategorieCompetences() {
+    return categorieCompetences;
+  }
+  /* -------------------------------------------- */
+  static getNiveauBase(category) {
+    return categorieCompetences[category].base;
+  }
+  /* -------------------------------------------- */
+  static getLabelCategorie(category) {
+    return categorieCompetences[category].label;
+  }
+
+  /* -------------------------------------------- */
+  static getCategorie(competence) {
+    return Misc.data(competence)?.data.categorie;
+  }
+  static isDraconic(competence) {
+    return Misc.data(competence).data.categorie == 'draconic';
+  }
+
+  /* -------------------------------------------- */
+  static getVoieDraconic(competences, voie) {
+    voie = Grammar.toLowerCaseNoAccent(voie);
+    return competences.find(it => RdDItemCompetence.isDraconic(it) && Grammar.toLowerCaseNoAccent(Misc.data(it).name).includes(voie));
+  }
+
+  /* -------------------------------------------- */
+  static getEsquive(competences) {
+    return { name: 'Esquive', niveau: RdDItemCompetence.findCompetence(competences, 'Esquive')?.data.niveau ?? -6 };
+  }
+
   /* -------------------------------------------- */
   static isCompetenceArme(competence) {
-    switch (competence.data.categorie) {
+    switch (Misc.templateData(competence).categorie) {
       case 'melee':
-        return competence.name.toLowerCase() != 'esquive';
+        return Misc.data(competence).name != 'Esquive';
       case 'tir':
       case 'lancer':
         return true;
@@ -34,15 +107,15 @@ export class RdDItemCompetence extends Item {
 
   /* -------------------------------------------- */
   static isArmeUneMain(competence) {
-    return competence?.name.toLowerCase().includes("1 main");
+    return Misc.data(competence)?.name.toLowerCase().includes("1 main");
   }
   static isArme2Main(competence) {
-    return competence?.name.toLowerCase().includes("2 main");
+    return Misc.data(competence)?.name.toLowerCase().includes("2 main");
   }
 
   /* -------------------------------------------- */
   static isMalusEncombrementTotal(competence) {
-    return competence?.name.toLowerCase().match(/(natation|acrobatie)/);
+    return Misc.data(competence)?.name.toLowerCase().match(/(natation|acrobatie)/);
   }
 
   /* -------------------------------------------- */
@@ -55,12 +128,52 @@ export class RdDItemCompetence extends Item {
     }
     return false;
   }
+
+  /* -------------------------------------------- */
+  static computeTotalXP(competences) {
+    const total = competences.map(c => RdDItemCompetence.computeXP(c))
+      .reduce(Misc.sum(), 0);
+    const economieTronc = RdDItemCompetence.computeEconomieXPTronc(competences);
+    return total - economieTronc;
+  }
+
+  /* -------------------------------------------- */
+  static computeXP(competence) {
+    const itemData = Misc.data(competence);
+    const factor = itemData.name.includes('Thanatos') ? 2 : 1; // Thanatos compte double !
+    const xpNiveau = RdDItemCompetence.computeDeltaXP(itemData.data.base, itemData.data.niveau ?? itemData.data.base);
+    const xp = itemData.data.xp ?? 0;
+    const xpSort = itemData.data.xp_sort ?? 0;
+    return factor * (xpNiveau + xp) + xpSort;
+  }
+
+  /* -------------------------------------------- */
+  static computeEconomieXPTronc(competences) {
+    return competenceTroncs.map(
+      list => list.map(name => RdDItemCompetence.findCompetence(competences, name))
+          // calcul du coût xp jusqu'au niveau 0 maximum
+          .map(it => RdDItemCompetence.computeDeltaXP(it?.data.base ?? -11, Math.min(it?.data.niveau ?? -11, 0)))
+          .sort(Misc.ascending()) 
+          .splice(0, list.length-1) // prendre toutes les valeurs sauf l'une des plus élevées
+          .reduce(Misc.sum(), 0)
+    ).reduce(Misc.sum(), 0);
+  }
+
+  /* -------------------------------------------- */
+  static computeDeltaXP(from, to) {
+    RdDItemCompetence._valideNiveau(from);
+    RdDItemCompetence._valideNiveau(to);
+    return competence_xp_cumul[to] - competence_xp_cumul[from];
+  }
+
+
   /* -------------------------------------------- */
   static computeCompetenceXPCost(competence) {
-    let xp = RdDItemCompetence.getDeltaXp(competence.data.base, competence.data.niveau ?? competence.data.base);
-    xp += competence.data.xp ?? 0;
-    if ( competence.name.includes('Thanatos') ) xp *= 2; /// Thanatos compte double !
-    xp += competence.data.xp_sort ?? 0;
+    const compData = Misc.data(competence);
+    let xp = RdDItemCompetence.getDeltaXp(compData.data.base, compData.data.niveau ?? compData.data.base);
+    xp += compData.data.xp ?? 0;
+    if (compData.name.includes('Thanatos')) xp *= 2; /// Thanatos compte double !
+    xp += compData.data.xp_sort ?? 0;
     return xp;
   }
 
@@ -69,19 +182,47 @@ export class RdDItemCompetence extends Item {
     let economie = 0;
     for (let troncList of competenceTroncs) {
       let list = troncList.map(name => RdDItemCompetence.findCompetence(competences, name))
-        .sort( (c1, c2) => c2.data.niveau - c1.data.niveau); // tri du plus haut au plus bas
-      list.splice(0,1); // ignorer la plus élevée
-      list.forEach(c => {
-        economie += RdDItemCompetence.getDeltaXp(c.data.base, Math.min(c.data.niveau, 0) );
+        .sort(Misc.descending(c => Misc.templateData(c).niveau)); // tri du plus haut au plus bas
+      list.splice(0, 1); // ignorer la plus élevée
+      list.map(c => Misc.templateData(c)).forEach(tplData => {
+        economie += RdDItemCompetence.getDeltaXp(tplData.base, Math.min(tplData.niveau, 0));
       });
     }
     return economie;
   }
 
+  /* -------------------------------------------- */
+  static levelUp(itemData) {
+    itemData.data.xpNext = RdDItemCompetence.getCompetenceNextXp(itemData.data.niveau);
+    itemData.data.isLevelUp = itemData.data.xp >= itemData.data.xpNext;
+  }
+
+  /* -------------------------------------------- */
+  static isVisible(itemData) {
+    return Number(itemData.data.niveau) != RdDItemCompetence.getNiveauBase(itemData.data.categorie);
+  }
+
+  /* -------------------------------------------- */
+  static isNiveauBase(itemData) {
+    return Number(itemData.data.niveau) == RdDItemCompetence.getNiveauBase(itemData.data.categorie);
+  }
+
   /* -------------------------------------------- */
   static findCompetence(list, name) {
-    name = name.toLowerCase();
-    return list.find(item => item.name.toLowerCase() == name && (item.type == "competence" || item.type == "competencecreature"))
+    name = Grammar.toLowerCaseNoAccent(name);
+    const competences = list.filter(it => Grammar.toLowerCaseNoAccent(it.name).includes(name) && (it.type == "competence" || it.type == "competencecreature"));
+    if (competences.length == 0) {
+      return undefined;
+    }
+    let competence = competences.find(it => Grammar.toLowerCaseNoAccent(it.name) == name);
+    if (!competence) {
+      competence = competences[0];
+      if (competences.length > 1) {
+        const names = competences.map(it => it.name).reduce((a, b) => `${a}<br>${b}`);
+        ui.notifications.info(`Plusieurs compétences possibles:<br>${names}<br>La première sera choisie: ${competence.name}`);
+      }
+    }
+    return competence;
   }
 
   /* -------------------------------------------- */
@@ -92,7 +233,7 @@ export class RdDItemCompetence extends Item {
   /* -------------------------------------------- */
   static getCompetenceXp(niveau) {
     RdDItemCompetence._valideNiveau(niveau);
-    return niveau < -10 ? 0 : competence_xp_par_niveau[niveau + 10];
+    return niveau < -10 ? 0 : xp_par_niveau[niveau + 10];
   }
 
   /* -------------------------------------------- */
@@ -103,10 +244,26 @@ export class RdDItemCompetence extends Item {
   }
 
   /* -------------------------------------------- */
-  static _valideNiveau(niveau){
-    if (niveau < -11 || niveau > competence_niveau_max) {
-      console.warn("Niveau en dehors des niveaux de compétences: [-11, " + competence_niveau_max + "]", niveau)
+  static _valideNiveau(niveau) {
+    if (niveau < -11 || niveau > niveau_max) {
+      console.warn(`Niveau ${niveau} en dehors des niveaux de compétences: [-11, ${niveau_max} ]`);
     }
   }
 
+  /* -------------------------------------------- */
+  static computeResumeArchetype(competences) {
+    const archetype = RdDItemCompetence.getLimitesArchetypes();
+    competences.map(it => Math.max(0, Misc.templateData(it).niveau_archetype))
+      .forEach(niveau => {
+        archetype[niveau] = archetype[niveau] ?? { "niveau": niveau, "nombreMax": 0, "nombre": 0 };
+        archetype[niveau].nombre = (archetype[niveau]?.nombre ?? 0) + 1;
+      });
+    return archetype;
+  }
+
+  /* -------------------------------------------- */
+  static getLimitesArchetypes() {
+    return duplicate(limitesArchetypes);
+  }
+
 }

module/item-competencecreature.js

@@ -1,10 +1,12 @@
+import { Misc } from "./misc.js";
+
 /* -------------------------------------------- */
 export class RdDItemCompetenceCreature extends Item {
 
   /* -------------------------------------------- */
   static setRollDataCreature(rollData) {
+    rollData.competence = Misc.data(rollData.competence);
     rollData.carac = { "carac_creature": { label: rollData.competence.name, value: rollData.competence.data.carac_value } };
-    rollData.competence = duplicate(rollData.competence);
     rollData.competence.data.defaut_carac = "carac_creature";
     rollData.competence.data.categorie = "creature";
     rollData.selectedCarac = rollData.carac.carac_creature;
@@ -15,31 +17,35 @@ export class RdDItemCompetenceCreature extends Item {
   }
 
   /* -------------------------------------------- */
-  static toArme(item) {
-    if (RdDItemCompetenceCreature.isCompetenceAttaque(item)) {
-      let arme = { name: item.name, data: duplicate(item.data) };
+  static toArme(itemData) {
+    if (RdDItemCompetenceCreature.isCompetenceAttaque(itemData)) {
+      itemData = Misc.data(itemData);
+      let arme = { name: itemData.name, data: duplicate(itemData) };
       mergeObject(arme.data,
         {
-          competence: item.name,
+          competence: itemData.name,
           resistance: 100,
           equipe: true,
+          dommagesReels: arme.data.dommages,
           penetration: 0,
           force: 0,
           rapide: true
         });
       return arme;
     }
-    console.error("RdDItemCompetenceCreature.toArme(", item, ") : impossible de transformer l'Item en arme");
+    console.error("RdDItemCompetenceCreature.toArme(", itemData, ") : impossible de transformer l'Item en arme");
     return undefined;
   }
 
   /* -------------------------------------------- */
-  static isCompetenceAttaque(item) {
-    return item.type == 'competencecreature' && item.data.iscombat;
+  static isCompetenceAttaque(itemData) {
+    itemData = Misc.data(itemData);
+    return itemData.type == 'competencecreature' && itemData.data.iscombat;
   }
-
+  
   /* -------------------------------------------- */
-  static isCompetenceParade(item) {
-    return item.type == 'competencecreature' && item.data.isparade;
+  static isCompetenceParade(itemData) {
+    itemData = Misc.data(itemData);
+    return itemData.type == 'competencecreature' && itemData.data.isparade;
   }
 }  

module/item-monnaie.js

@@ -0,0 +1,61 @@
+import { Misc } from "./misc.js";
+
+const monnaiesData = [
+  {
+    name: "Etain (1 denier)", type: 'monnaie',
+    img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_etain_poisson.webp",
+    data: { quantite: 0, valeur_deniers: 1, encombrement: 0.001, description: "" }
+  },
+  {
+    name: "Bronze (10 deniers)", type: 'monnaie',
+    img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_bronze_epees.webp",
+    data: { quantite: 0, valeur_deniers: 10, encombrement: 0.002, description: "" }
+  },
+  {
+    name: "Argent (1 sol)", type: 'monnaie',
+    img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_argent_sol.webp",
+    data: { quantite: 0, valeur_deniers: 100, encombrement: 0.003, description: "" }
+  },
+  {
+    name: "Or (10 sols)", type: 'monnaie',
+    img: "systems/foundryvtt-reve-de-dragon/icons/objets/piece_or_sol.webp",
+    data: { quantite: 0, valeur_deniers: 1000, encombrement: 0.004, description: "" }
+  }
+]
+
+export class Monnaie {
+
+  static isSystemMonnaie(item) {
+    let present = monnaiesData.find(monnaie => monnaie.data.valeur_deniers == Misc.data(item)?.data?.valeur_deniers);
+    return present;
+  }
+
+  static monnaiesData() {
+    return monnaiesData;
+  }
+
+  static filtrerMonnaies(items) {
+    return items.filter(it => Misc.data(it).type == 'monnaie');
+  }
+
+  static monnaiesManquantes(items) {
+    const valeurs = Monnaie.filtrerMonnaies(items)
+      .map(it => Misc.templateData(it).valeur_deniers);
+    const manquantes = monnaiesData.filter(monnaie => !valeurs.find(v => v != Misc.templateData(monnaie).valeur_deniers));
+    //const manquantes = monnaiesData.filter(monnaie => !valeurs.find(v => v != Misc.templateData(monnaie).valeur_deniers) );
+    //console.log("Valeurs : ", valeurs, manquantes);
+    return []; //manquantes;
+  }
+
+  static deValeur(monnaie, v) {
+    return v != monnaie.data.valeur_deniers;
+  }
+
+  static arrondiDeniers(sols) {
+    return sols.toFixed(2);
+  }
+
+  static triValeurDenier() {
+    return Misc.ascending(item => Misc.data(item).data.valeur_deniers);
+  }
+}