From 0d3c0055506779eec4809fb63e34a3ad06837afe Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Fri, 11 Dec 2020 02:20:41 +0100 Subject: [PATCH 1/5] Icones des heures dans le calendrier --- icons/heures/hd01.svg | 38 +++++++++++++++---------- icons/heures/hd02.svg | 30 ++++++++++--------- icons/heures/hd03.svg | 27 +++++++++--------- icons/heures/hd04.svg | 32 +++++++++++---------- icons/heures/hd05.svg | 34 +++++++++++++--------- icons/heures/hd06.svg | 26 +++++++++-------- icons/heures/hd07.svg | 32 +++++++++++---------- icons/heures/hd08.svg | 29 ++++++++++--------- icons/heures/hd09.svg | 28 +++++++++--------- icons/heures/hd10.svg | 32 +++++++++++---------- icons/heures/hd11.svg | 26 +++++++++-------- icons/heures/hd12.svg | 33 ++++++++++----------- module/rdd-calendrier.js | 49 +++++++++++++++++++------------- styles/simple.css | 9 +++--- templates/calendar-template.html | 4 +-- 15 files changed, 236 insertions(+), 193 deletions(-) diff --git a/icons/heures/hd01.svg b/icons/heures/hd01.svg index ba4f7f01..17a9453c 100644 --- a/icons/heures/hd01.svg +++ b/icons/heures/hd01.svg @@ -7,9 +7,9 @@ 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="26.36125mm" - height="33.664585mm" - viewBox="0 0 149.44185 190.84472" + width="200" + height="200" + viewBox="0 0 299.98443 299.98487" version="1.1" id="svg18" sodipodi:docname="hd01.svg" @@ -22,6 +22,7 @@ image/svg+xml + @@ -36,22 +37,29 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="2491" - inkscape:window-height="480" + inkscape:window-width="3840" + inkscape:window-height="2066" id="namedview20" showgrid="false" - inkscape:zoom="1.6806796" - inkscape:cx="-443.77151" - inkscape:cy="70.336878" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="0" - inkscape:current-layer="svg18" /> + inkscape:zoom="1" + inkscape:cx="100" + inkscape:cy="660" + inkscape:window-x="-11" + inkscape:window-y="-11" + inkscape:window-maximized="1" + inkscape:current-layer="svg18" + inkscape:document-rotation="0" + units="px" + showguides="true"> + + + stroke-width="1.45" + d="m 151.66788,12.35477 c 0,0 2.9,0 2.9,0 3.9875,12.1075 2.9,22.2575 2.9,34.8 0,0 0,52.2 0,52.2 0,0 2.291,29 2.291,29 0.58,4.0165 0.667,8.99 4.1325,11.7015 4.466,3.48 19.64751,4.234 25.4765,4.2485 0,0 21.75,0 21.75,0 0,0 20.3,-1.45 20.3,-1.45 0,0 13.05,0 13.05,0 7.54,0.0145 16.356,0.7105 11.977,11.455 -2.059,5.017 -9.1205,7.7285 -13.427,11.0635 -6.8875,5.3215 -13.6445,13.543 -18.183,20.9815 -19.981,32.8135 -21.721,84.825 -64.467,98.5565 -6.699,2.1605 -10.382,2.8565 -17.4,2.697 0,0 -23.2,0 -23.2,0 -14.6885,-2.7985 -28.057497,-11.977 -33.697997,-25.8535 0,0 -10.846,-37.4825 -10.846,-37.4825 -7.656,-10.0485 -19.864999,3.567 -28.840499,-4.1905 -4.8285,-4.408 -5.8435,-16.385 0,-20.561 6.032,-4.553 33.422499,-11.5275 41.484499,-11.716 0,0 0,17.4 0,17.4 0.058,10.7155 2.0155,23.055 4.9735,33.35 2.7695,9.7005 5.6695,16.182 13.876497,22.5765 15.08,11.9045 43.7465,9.4395 59.45,0 23.722,-14.384 33.611,-40.397 44.109,-64.6265 0,0 11.6,-26.1 11.6,-26.1 2.7405,-12.18 -11.6435,-8.497 -18.009,-7.453 0,0 -10.15,0 -10.15,0 -7.72849,0.2175 -22.3735,-0.899 -28.4345,4.147 -4.5675,3.8135 -4.843,9.4395 -4.9155,14.906 0,0 -1.45,59.45 -1.45,59.45 0,0 -5.8,0 -5.8,0 -1.653,-9.193 -2.8855,-16.6895 -2.9,-26.1 -0.029,-17.9075 8.671,-50.286 -18.85,-50.75 0,0 -57.999997,0 -57.999997,0 -6.786,-0.1305 -13.1805,-1.508 -11.5275,-10.15 1.5805,-8.2795 11.136,-13.92 17.3275,-18.85 10.5995,-8.468 16.8635,-15.4425 25.142997,-26.1 16.5155,-21.3005 27.8255,-46.0375 37.4825,-71.05 0,0 9.8745,-26.1 9.8745,-26.1 z m -5.8,59.45 c -3.045,0.9425 -4.0165,0.9425 -6.4815,3.3495 -6.612,6.4525 -16.8925,33.292 -21.0685,43.0505 -1.711,4.002 -6.902,13.4995 -6.496,17.313 0.6235,5.771 6.3945,5.8 10.846,5.887 4.64,0.0725 13.311,0.5075 17.2405,-1.6965 9.0335,-5.0895 5.9595,-26.767 5.9595,-36.0035 0,0 0,-31.9 0,-31.9 z" + style="fill:#ffffff;stroke:none" /> diff --git a/icons/heures/hd02.svg b/icons/heures/hd02.svg index 44947939..40121451 100644 --- a/icons/heures/hd02.svg +++ b/icons/heures/hd02.svg @@ -7,9 +7,9 @@ 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="20.692871mm" - height="32.808334mm" - viewBox="0 0 117.30806 185.99022" + width="200" + height="200" + viewBox="0 0 299.98504 299.98421" version="1.1" id="svg3" sodipodi:docname="hd02.svg" @@ -37,23 +37,25 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="2025" - inkscape:window-height="1420" + inkscape:window-width="1677" + inkscape:window-height="1195" id="namedview5" showgrid="false" - inkscape:zoom="6.9037464" - inkscape:cx="50.418528" - inkscape:cy="68.666886" - inkscape:window-x="613" - inkscape:window-y="167" + inkscape:zoom="1.7038548" + inkscape:cx="-68.974332" + inkscape:cy="165.35734" + inkscape:window-x="830" + inkscape:window-y="264" inkscape:window-maximized="0" inkscape:current-layer="svg3" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + showguides="false" + units="px" /> + stroke-width="1.48994" + d="m 62.126949,61.340325 c 4.276142,-14.482276 22.945165,-29.813819 38.738591,-23.854034 9.43136,3.560969 17.70056,13.871394 29.79892,10.742517 24.30102,-6.28758 39.11108,-37.546648 71.51741,-37.546648 7.28584,0 11.2789,0.163904 17.87935,3.754666 3.63547,1.966729 8.62678,5.393603 11.41299,8.433095 10.77233,11.725873 6.10877,24.837392 -0.78967,36.980463 -3.15869,5.557487 -7.98611,11.055395 -7.25605,17.879347 0.84927,7.85202 9.66974,15.614639 8.6566,23.839129 -0.61088,5.00623 -7.46462,13.96079 -10.13164,19.3693 -4.87211,9.87835 -6.34716,18.92231 -6.36206,29.79891 0,0 0,17.87936 0,17.87936 0,0 1.48995,23.83914 1.48995,23.83914 0.11929,26.16346 1.51974,35.02865 -10.80213,59.59786 -5.92998,11.83015 -12.12815,20.20364 -23.46663,27.48949 -16.86621,10.8468 -35.08824,7.06234 -52.14812,-1.04295 -6.95805,-3.30769 -19.81628,-10.57862 -26.81903,-11.24912 -16.13611,-1.54952 -26.163446,14.70578 -38.738592,22.0512 1.773036,-15.68912 18.117744,-33.86645 34.268759,-35.4607 12.977433,-1.28135 26.506133,10.69781 37.248643,16.896 17.67076,10.19122 40.18383,10.20611 54.68102,-5.40851 4.36555,-4.69334 7.73282,-10.48922 10.48922,-16.25531 4.02286,-8.44801 4.81253,-14.63126 4.69333,-23.83914 0,0 0,-14.89946 0,-14.89946 0.11925,-24.7331 -5.94489,-46.44162 0,-71.51742 1.25156,-7.09213 3.29278,-13.18603 7.18155,-19.36929 2.14551,-3.41199 7.56892,-10.01244 8.3139,-13.40952 1.47504,-6.853746 -7.13684,-13.707492 -7.67322,-23.839127 -0.62579,-12.098372 7.4944,-19.265012 10.817,-29.798928 C 229.34359,39.065632 221.08929,22.184544 206.6517,19.934726 177.44875,15.39039 148.70771,55.544426 123.21473,60.26757 107.97259,63.098459 94.563069,49.823043 84.476138,49.718749 75.283168,49.614486 69.859766,57.689953 62.126949,61.340325 Z m 4.469837,52.148105 c 3.173585,-11.1001 13.856496,-26.819018 25.329081,-30.022407 4.201647,-1.400554 11.159693,0.327784 16.389403,0 8.74598,-0.119251 18.95211,-3.143783 26.81903,-6.898449 18.99681,-9.073772 29.24764,-23.451756 40.22854,-28.63677 -8.82048,12.321861 -36.50368,38.8429 -50.65816,44.594083 -8.58209,3.486488 -24.31592,0.01497 -32.778813,2.443514 -6.451467,1.847537 -17.96875,13.588309 -25.329081,18.520029 z m 16.389405,31.28886 c 4.767828,-16.67249 20.009969,-31.24417 35.758699,-37.94891 7.62853,-3.26299 13.54361,-2.22003 26.81903,-9.520759 0,0 34.26876,-24.04773 34.26876,-24.04773 -2.50311,6.58557 -6.66006,12.396358 -8.1649,19.369304 0,0 -0.77477,41.718475 -0.77477,41.718475 -0.11924,9.81875 -2.44353,16.92579 -7.55404,25.32909 -4.03774,6.64518 -11.51727,15.83812 -11.50239,23.83914 0.0298,20.15896 40.80963,31.33356 18.78824,53.36986 -2.01144,1.99654 -4.67845,4.06756 -7.18154,5.37871 -11.88978,6.22797 -15.39115,-3.54608 -31.28887,-7.97123 -13.7522,-3.60566 -30.20121,-0.0896 -44.698382,0 -4.499636,-0.13403 -9.282362,0.29799 -13.275417,-2.50308 -8.55229,-6.33229 -10.578617,-20.18879 0,-25.92507 0,0 2.875595,13.27541 2.875595,13.27541 10.23593,18.71373 38.455504,1.11745 55.098204,5.22972 11.32358,2.78618 23.42193,19.87588 31.67626,8.13509 4.67842,-6.64514 0.0895,-12.67943 -4.91684,-17.25356 -8.73108,-7.9712 -20.08447,-13.08173 -18.98191,-27.26601 0.74498,-9.62505 8.65659,-16.13613 13.51382,-23.83912 5.46809,-8.65662 9.19295,-21.06787 9.86344,-31.28889 0.47678,-7.21135 -0.55129,-20.63576 -8.83539,-23.24316 -3.73976,-1.17706 -12.44104,2.56271 -16.3596,3.87386 -13.39462,4.46983 -29.14334,8.58208 -40.168943,17.61116 0,0 -14.959056,13.6777 -14.959056,13.6777 z" + style="fill:#ffffff;stroke:none" /> diff --git a/icons/heures/hd03.svg b/icons/heures/hd03.svg index 03b078d8..16b19c28 100644 --- a/icons/heures/hd03.svg +++ b/icons/heures/hd03.svg @@ -7,9 +7,9 @@ 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="23.516745mm" - height="29.463888mm" - viewBox="0 0 133.31635 167.03095" + width="200" + height="200" + viewBox="0 0 299.98441 299.98488" version="1.1" id="svg3" sodipodi:docname="hd03.svg" @@ -37,23 +37,24 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1531" - inkscape:window-height="1088" + inkscape:window-width="3840" + inkscape:window-height="2066" id="namedview5" showgrid="false" - inkscape:zoom="2.3768399" + inkscape:zoom="4.9490365" inkscape:cx="228.35679" inkscape:cy="83.518468" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="0" + inkscape:window-x="-11" + inkscape:window-y="-11" + inkscape:window-maximized="1" inkscape:current-layer="svg3" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + units="px" /> + stroke-width="1.6625" + d="m 56.584182,270.49795 c -23.308249,-41.097 -22.709749,-93.11662 -1.230249,-134.66249 11.105499,-21.49612 23.507749,-30.97237 27.314874,-38.237498 3.3915,-6.467125 2.310875,-14.99575 9.359875,-28.262501 15.577628,-29.293249 46.234128,-58.021249 80.930498,-58.187499 0,0 9.975,0 9.975,0 10.45713,0.133 18.62,1.96175 28.2625,6.01825 15.87688,6.65 23.84025,14.713125 33.25,28.89425 4.655,7.01575 10.4405,16.924249 12.93425,24.937499 1.94513,6.251 1.64588,8.87775 2.29425,14.962501 3.44138,32.019748 -1.23025,62.243998 -10.00825,93.099988 0,0 -10.29087,31.5875 -10.29087,31.5875 0,0 -26.0015,59.85 -26.0015,59.85 -4.123,8.96088 -5.41975,19.152 -17.14038,18.2875 0,0 11.72063,-33.25 11.72063,-33.25 0,0 26.31737,-76.475 26.31737,-76.475 4.63838,-17.57261 10.09138,-38.35386 10.1745,-56.52499 0.14963,-32.767873 -7.6475,-62.809248 -31.5875,-86.433373 -11.65412,-11.47125 -26.21762,-20.38225 -43.225,-19.102125 -12.06975,0.89775 -24.77125,5.1205 -34.9125,11.687375 -10.80625,6.9825 -25.25337,23.092125 -28.861,35.660624 -2.42725,8.41225 0.84788,12.103 -3.90687,21.612501 -6.949253,13.965 -38.885878,52.501748 -45.153503,69.824998 -2.876124,7.94675 -1.928499,27.33149 -1.878624,36.57499 0.04988,9.044 0.482125,9.65913 1.662499,18.2875 1.03075,7.53113 2.75975,25.55263 13.33325,25.55263 6.55025,0 15.178625,-11.7705 20.199375,-16.12625 10.556873,-9.19363 30.274123,-18.70313 44.604873,-15.428 17.32325,3.97337 20.33238,26.21762 3.325,32.60162 -2.0615,-4.13962 -3.724,-8.01325 -7.01575,-11.40475 -4.15625,-4.256 -8.778,-6.00162 -14.59675,-6.5835 -23.657373,-2.41062 -35.959873,23.22513 -47.148498,39.60075 -4.1895,6.13463 -5.968375,8.379 -12.7015,11.6375 z M 174.52193,99.277087 c 0.51538,-0.1995 2.31088,-0.947625 4.27263,0 2.394,1.995003 1.04737,5.935123 0,8.295873 -1.76225,5.90188 -6.3175,16.50863 -12.60175,18.63663 -7.98,2.67662 -9.16038,-6.56688 -7.19863,-11.98663 2.44388,-6.73312 9.31,-12.20275 15.52775,-14.945873 z" + style="fill:#ffffff;stroke:none" /> diff --git a/icons/heures/hd04.svg b/icons/heures/hd04.svg index 55f3545e..1941f89e 100644 --- a/icons/heures/hd04.svg +++ b/icons/heures/hd04.svg @@ -7,9 +7,9 @@ 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="19.399706mm" - height="28.915499mm" - viewBox="0 0 109.97687 163.92212" + width="200" + height="200" + viewBox="0 0 299.98441 299.98487" version="1.1" id="svg3" sodipodi:docname="hd04.svg" @@ -22,6 +22,7 @@ image/svg+xml + @@ -36,23 +37,24 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="2541" - inkscape:window-height="480" + inkscape:window-width="3840" + inkscape:window-height="2066" id="namedview5" showgrid="false" - inkscape:zoom="1.6806796" - inkscape:cx="-378.82119" - inkscape:cy="52.007069" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="0" + inkscape:zoom="4.7536798" + inkscape:cx="71.090069" + inkscape:cy="24.560891" + inkscape:window-x="-11" + inkscape:window-y="-11" + inkscape:window-maximized="1" inkscape:current-layer="svg3" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + units="px" /> + stroke-width="1.5552" + d="m 143.78949,23.221253 c 48.35117,-6.205248 78.11769,30.030912 87.0912,73.965308 1.86624,9.144579 4.94554,33.172419 4.6034,41.990399 -0.46656,11.95949 -3.74804,48.69331 -6.84288,59.0976 -7.15394,24.02784 -24.24557,46.54714 -44.41652,61.0416 -9.67334,6.9673 -23.95008,14.54112 -35.7696,16.50067 -4.32345,0.69984 -11.32185,1.81959 -15.552,1.61741 -5.81644,-0.29549 -11.77286,-2.31725 -17.1072,-4.54118 -27.262657,-11.33741 -40.481857,-37.72915 -46.033921,-65.2873 -2.64384,-13.17254 -5.272128,-39.51763 -5.28768,-52.8768 -0.06221,-38.94221 12.161664,-84.043003 40.435201,-111.958843 5.45876,-5.365438 11.75732,-10.870846 18.6624,-14.276734 5.97197,-2.93933 13.65466,-4.059074 20.2176,-5.27213 z m -4.6656,30.886272 c -14.47891,2.737152 -22.17715,7.884864 -32.6592,18.211392 C 77.817905,100.5769 68.999921,150.98093 79.886321,188.94336 c 7.589376,26.48506 29.875399,52.51911 59.237569,52.8768 0,0 13.9968,0 13.9968,0 21.07296,-0.24883 36.96711,-12.8615 48.64666,-29.5488 20.99519,-29.99981 24.1989,-58.33555 14.88326,-93.312 -5.66092,-21.228479 -20.01542,-49.019899 -40.20192,-59.361979 -11.13523,-5.692032 -25.06982,-6.702912 -37.3248,-5.489856 z m -6.2208,36.049532 c 7.23168,-0.88646 10.15546,-0.09336 17.1072,1.804032 35.58298,9.704451 43.59226,40.870661 43.5456,73.654271 -0.0156,14.96103 -3.59251,24.02784 -13.17254,35.7696 -5.73869,7.04506 -18.14918,17.76039 -27.26266,19.57997 -15.70752,3.1415 -40.96396,-12.11501 -48.35116,-25.80077 C 88.175537,164.38675 93.152183,100.73242 132.90309,90.157057 Z m 4.6656,23.094723 c -25.86297,6.43853 -34.78982,48.25785 -23.76345,64.77408 4.26125,6.36077 11.88173,9.72 19.09785,11.664 4.52564,1.01088 7.88487,0.82425 12.4416,0 3.87245,-0.46656 12.11501,-2.08397 15.552,-3.54586 11.15079,-4.72781 24.4322,-18.39801 22.98586,-31.41504 -2.48832,-22.34822 -23.01696,-43.85664 -46.31386,-41.47718 z" + style="fill:#ffffff;stroke:none" /> diff --git a/icons/heures/hd05.svg b/icons/heures/hd05.svg index 491f38aa..64a93f75 100644 --- a/icons/heures/hd05.svg +++ b/icons/heures/hd05.svg @@ -7,9 +7,9 @@ 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="36.291473mm" - height="35.705048mm" - viewBox="0 0 205.73631 202.41186" + width="200" + height="200" + viewBox="0 0 299.9845 299.9845" version="1.1" id="svg3" sodipodi:docname="hd05.svg" @@ -22,7 +22,7 @@ image/svg+xml - + @@ -37,23 +37,31 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1976" - inkscape:window-height="1359" + inkscape:window-width="3840" + inkscape:window-height="2066" id="namedview5" showgrid="false" inkscape:zoom="6.0476878" inkscape:cx="19.086896" inkscape:cy="63.635654" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="0" + inkscape:window-x="-11" + inkscape:window-y="-11" + inkscape:window-maximized="1" inkscape:current-layer="svg3" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + units="px" /> + stroke-width="1.4" + d="m 104.4657,8.303951 c 9.8098,3.1262 16.6166,9.7482 24.64,15.939 0,0 41.58001,29.953 41.58001,29.953 7.623,4.62 25.3022,10.8724 29.26,17.248 -12.3354,-0.6006 -22.4224,-6.0676 -33.88,-10.2872 -5.1898,-1.9096 -11.242,-4.7894 -16.8784,-3.2032 -2.80281,0.7854 -4.46601,2.0636 -6.08301,4.466 -3.234,4.8202 -7.1302,23.5928 -2.6026,27.9664 8.60861,8.3006 27.93561,-3.9578 34.75781,8.8704 2.9568,5.528589 -0.4004,11.257389 -1.1704,16.847589 -1.1704,8.4084 -0.4158,22.6072 1.8788,30.8 3.8038,13.56741 8.5624,24.03941 17.017,35.42001 6.0214,8.1004 15.4154,16.4472 19.2808,24.64 -28.721,-10.9032 -47.7092,-28.6748 -56.6566,-58.52 -2.079,-6.91461 -3.9424,-18.88041 -4.6816,-26.18001 -0.5236,-5.1282 0.0308,-10.6414 -4.21961,-14.4914 -2.9414,-2.6488 -14.6454,-4.4968 -19.1422,-5.75959 0,0 -40.04,-12.982199 -40.04,-12.982199 -4.312,-0.9548 -15.7542,-4.2042 -18.0334,1.3706 -1.6324,4.0194 6.2832,15.446189 8.393,19.542589 6.2832,12.166 11.7502,24.948 14.1372,38.50001 0,0 3.234,25.9644 3.234,25.9644 3.465,5.929 16.6782,7.854 23.0692,10.01 12.474,4.1888 28.5054,12.4124 36.96001,22.5456 -6.8838,-1.9558 -9.20921,-3.7114 -15.40001,-6.3602 -13.2286,-5.6518 -27.3812,-8.3776 -41.58,-10.1486 -6.4372,-0.8008 -22.561,-1.1396 -26.796,-5.8366 -4.4044,-4.8818 -1.6016,-16.2624 -1.0318,-22.3146 1.309,-14.19881 0.8008,-27.84321 -3.5112,-41.58001 -4.9434,-15.7542 -12.458601,-29.752789 -24.116401,-41.579989 -8.854999,-8.9628 -20.790001,-14.8148 -26.1646,-26.18 0,0 75.460001,29.029 75.460001,29.029 4.8664,1.3244 22.792,6.083 26.796,2.2484 2.0482,-2.4948 0.3234,-10.5952 0,-14.3374 0.6468,-30.0454 -7.9618,-37.4528 -14.476,-61.6 z M 6.0750988,226.98395 c 9.9946002,1.9404 17.2325992,8.547 26.0105992,13.86 2.926002,1.771 9.101401,5.0666 10.533601,8.1466 2.2022,4.7894 -3.9424,7.0686 -1.7864,13.4288 3.4804,10.318 22.591801,18.172 32.832801,16.3702 2.772,-0.4774 5.2822,-1.54 7.6384,-3.0492 19.5272,-12.5972 -6.6836,-28.9058 -15.169,-38.038 -3.0338,-3.2494 -5.2822,-6.2216 -5.9598,-10.7184 -3.249401,-21.6216 22.9306,-16.7552 35.0504,-13.1824 37.5144,11.0572 70.65521,50.5736 110.88001,24.6554 5.3284,-3.4342 10.9186,-8.2698 15.1228,-13.013 30.0916,-33.9724 8.393,-81.89721 7.9772,-117.04001 -0.1848,-16.231589 0.1848,-41.194989 18.48,-48.140389 16.7398,-6.3756 54.2388,14.9688 44.8294,37.2064 -3.2032,7.561389 -11.7656,8.007989 -18.6186,5.590189 -2.8182,-1.00099 -8.008,-3.926989 -5.929,-7.684589 1.5554,-2.8336 9.2708,-3.542 10.0254,-10.1024 0.6776,-5.9906 -8.4392,-15.4 -17.9872,-11.165 -10.8108,4.7894 -15.939,15.1844 -15.1228,26.595799 1.001,13.92159 5.0358,26.65739 8.393,40.03999 9.7174,38.91581 11.9504,98.79101 -33.3102,116.31621 -8.6548,3.3572 -17.0324,3.8962 -26.18,3.8038 -24.4244,-0.2772 -48.44841,-13.2902 -69.30001,-24.8556 -7.3766,-4.081 -27.5506,-15.7388 -35.42,-13.552 -7.7,2.1406 -10.2872,8.5316 -6.1138,15.3076 6.8992,11.1804 36.6828,25.9182 22.3916,44.5984 -1.771,2.3254 -4.5738,4.8356 -7.0378,6.391 -3.8192,2.387 -6.4064,2.7258 -10.78,2.8798 -16.4318,0.6006 -29.491,-4.543 -43.120001,-13.3672 0,0 -15.400001,-11.2112 -15.400001,-11.2112 -8.931998,-4.312 -19.6195992,4.6662 -22.9305992,-6.2832 -0.1232,-1.617 -0.1386,-4.3582 0,-6.0676 0,0 0,-27.72 0,-27.72 z" + style="fill:#ffffff;stroke:none" /> + diff --git a/icons/heures/hd06.svg b/icons/heures/hd06.svg index d8a6a5d0..48887693 100644 --- a/icons/heures/hd06.svg +++ b/icons/heures/hd06.svg @@ -7,9 +7,9 @@ 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="35.685276mm" - height="26.831001mm" - viewBox="0 0 202.29972 152.10509" + width="200" + height="200" + viewBox="0 0 299.9844 299.98487" version="1.1" id="svg3" sodipodi:docname="hd06.svg" @@ -22,6 +22,7 @@ image/svg+xml + @@ -36,23 +37,24 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="2044" - inkscape:window-height="480" + inkscape:window-width="3840" + inkscape:window-height="2066" id="namedview5" showgrid="false" inkscape:zoom="1.6806796" inkscape:cx="371.26516" inkscape:cy="37.442828" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="0" + inkscape:window-x="-11" + inkscape:window-y="-11" + inkscape:window-maximized="1" inkscape:current-layer="svg3" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + units="px" /> + stroke-width="1.62624" + d="m 8.382186,249.37012 c 5.334067,-10.71691 12.53831,-11.17226 21.141119,-18.4253 2.715821,-2.29299 7.805952,-6.81394 7.805952,-10.66812 0,-3.48017 -3.463891,-5.17145 -6.212236,-6.26103 -7.090407,-2.82966 -20.929709,-2.99229 -21.401319,-13.43276 -0.146361,-3.23621 1.740077,-6.55375 4.179437,-8.57028 12.115488,-9.95259 42.737587,2.09784 57.910406,1.30099 13.026183,-0.68302 29.792715,-16.5226 39.029755,-25.32056 5.69184,-5.41538 17.88864,-14.16455 16.6527,-22.70231 -1.08958,-7.57828 -12.86356,-18.6855 -18.00248,-24.3936 0,0 -37.810074,-42.282241 -37.810074,-42.282241 -3.577728,-3.886714 -17.677229,-18.815598 -19.10832,-22.669786 -1.853914,-4.976294 2.146637,-6.342336 6.261024,-6.228499 7.562016,0.211411 12.684672,4.358323 17.839853,9.41593 0,0 48.868507,60.073306 48.868507,60.073306 4.82994,4.84619 15.35171,15.56312 22.70231,13.66041 6.70011,-1.72381 20.86466,-16.34371 25.74336,-21.72656 0,0 50.6899,-56.772039 50.6899,-56.772039 4.5047,-4.179437 11.53005,-10.22905 17.88864,-10.798234 5.6268,-0.520397 10.45673,3.008544 8.68413,9.058157 -1.59372,5.512954 -15.43303,18.100051 -20.06781,22.734835 0,0 -50.41344,48.852251 -50.41344,48.852251 -3.13863,2.99228 -19.85637,18.96196 -20.86463,21.53142 -0.66677,1.69129 -0.61798,2.79713 0,4.48842 1.08957,3.05733 7.93605,10.09895 10.42419,12.94487 8.99309,10.32662 26.97931,25.87348 38.08652,34.3462 4.30954,3.285 14.26214,11.56257 19.51488,11.62762 4.30954,0.0651 9.0419,-4.13068 13.00992,-6.04964 9.78998,-4.73234 30.44322,-9.95257 40.46085,-4.52094 2.89471,1.5612 4.9763,3.6753 5.6268,7.00909 2.01653,10.60311 -12.22932,12.74974 -18.19763,17.51463 -2.56945,2.04907 -4.78114,4.71609 -3.91923,8.22878 2.39057,9.62734 23.77562,6.06586 26.50771,18.03499 1.20341,5.33407 -3.54521,7.82222 -8.22878,6.91152 -6.19597,-1.21968 -12.09922,-7.87099 -21.1086,-9.31835 -8.86301,-1.44735 -24.23098,4.61853 -34.15104,5.36659 -6.11465,0.45535 -15.62816,-0.53666 -17.02673,-7.93606 -1.95149,-10.35914 11.92034,-15.51432 8.65159,-24.29602 -2.40682,-6.42364 -13.69293,-13.49779 -19.27094,-17.43331 0,0 -39.02975,-30.75219 -39.02975,-30.75219 -4.94376,-3.70783 -14.76625,-12.27811 -21.14111,-11.17227 -3.91924,0.66676 -12.83103,7.17172 -16.2624,9.72491 0,0 -32.524795,26.31257 -32.524795,26.31257 -3.740352,2.99228 -12.391948,9.93634 -12.456998,15.04274 -0.146362,9.5135 28.377883,12.57082 20.279213,27.58102 -3.642778,6.76516 -12.538311,7.02535 -19.205895,6.24477 -12.326899,-1.41484 -32.671161,-6.99283 -43.90848,-4.69984 -14.993932,3.0736 -15.611903,10.91207 -27.646079,8.42392 z m 26.019839,-52.03969 c 2.049063,4.09811 2.618247,5.44789 6.602535,8.17998 4.488422,3.08988 9.204518,4.61854 14.50606,2.66705 9.188257,-3.38259 7.187981,-10.45672 -1.62624,-12.26186 0,0 -8.098675,0 -8.098675,0 0,0 -11.38368,1.41483 -11.38368,1.41483 z M 237.682,216.84532 c 0,0 6.50496,1.07333 6.50496,1.07333 3.18744,0.22767 12.71721,-1.33353 9.48098,-6.66759 -1.23593,-2.04906 -13.85556,-6.73267 -15.98594,5.59426 z m -167.502695,16.2624 c -2.553196,-7.69211 -5.431641,-7.67585 -13.00992,-8.1312 2.553197,8.0011 5.155181,7.85475 13.00992,8.1312 z m 175.633895,4.87872 c 0,0 -8.1312,-3.25248 -8.1312,-3.25248 0,0 -1.62624,6.50496 -1.62624,6.50496 5.80569,0.73181 5.51296,0.7806 9.75744,-3.25248 z" + style="fill:#ffffff;stroke:none" /> diff --git a/icons/heures/hd07.svg b/icons/heures/hd07.svg index 329233bd..f01cc1eb 100644 --- a/icons/heures/hd07.svg +++ b/icons/heures/hd07.svg @@ -7,9 +7,9 @@ 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="22.558666mm" - height="29.608454mm" - viewBox="0 0 127.88501 167.85049" + width="200" + height="200" + viewBox="0 0 299.98441 299.98488" version="1.1" id="svg3" sodipodi:docname="hd07.svg" @@ -22,6 +22,7 @@ image/svg+xml + @@ -36,23 +37,24 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="2047" - inkscape:window-height="1018" + inkscape:window-width="3840" + inkscape:window-height="2066" id="namedview5" showgrid="false" - inkscape:zoom="1.6806796" - inkscape:cx="-282.89299" - inkscape:cy="53.999276" - inkscape:window-x="499" - inkscape:window-y="955" - inkscape:window-maximized="0" + inkscape:zoom="4.7536798" + inkscape:cx="50.113431" + inkscape:cy="110.18717" + inkscape:window-x="-11" + inkscape:window-y="-11" + inkscape:window-maximized="1" inkscape:current-layer="svg3" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + units="px" /> + stroke-width="1.458" + d="m 203.85452,50.949891 c 0,0 -1.21014,16.038 -1.21014,16.038 -0.93312,12.13056 7.85862,17.00028 11.63484,8.66052 0,0 2.65356,-26.15652 2.65356,-26.15652 0.34992,-5.71536 0.5832,-11.31408 7.3629,-13.07826 7.37748,-1.92456 14.04054,3.09096 15.51312,10.16226 0,0 1.95372,53.945999 1.95372,53.945999 0,0 1.458,23.328 1.458,23.328 0,0 -1.458,21.87 -1.458,21.87 -0.0583,39.19104 -5.93406,82.2312 -37.908,108.88344 -16.767,13.96764 -34.39422,16.19838 -55.404,17.70012 -6.24024,0.4374 -17.10234,-1.98288 -23.328,-3.5721 -40.444921,-10.3518 -66.105719,-38.2725 -65.609999,-80.72946 0.32076,-27.00216 19.128958,-58.58244 32.294699,-81.648 8.76258,-15.367319 19.3185,-28.168559 17.51058,-46.655999 -0.62694,-6.38604 -2.95974,-15.44022 -8.64594,-19.15812 -7.61076,-4.98636 -25.631641,4.02408 -28.095661,17.70012 -2.361958,13.09284 10.5705,16.51914 12.27636,20.90772 2.71188,6.98382 -9.41868,8.32518 -13.676038,8.1648 -10.7892,-0.37908 -15.2361,-8.90838 -14.2884,-18.86652 1.63296,-17.14608 23.153038,-39.847141 40.532398,-40.765681 17.962561,-0.93312 24.115321,11.095381 22.861441,27.643681 -3.41172,44.687699 -41.348881,78.382079 -41.815441,118.097999 -0.45198,39.05982 21.38886,64.31238 55.404001,81.2835 4.50522,2.24532 8.15022,4.06782 13.122,5.20506 10.1331,2.31822 33.12576,2.08494 39.11814,-8.06274 2.02662,-3.45546 1.70586,-8.87922 1.70586,-12.81582 0,0 0,-32.076 0,-32.076 0,0 2.66814,-29.16 2.66814,-29.16 0,0 1.83708,-29.16 1.83708,-29.16 0,0 1.32678,-23.328 1.32678,-23.328 -0.17496,-13.95306 0.18954,-23.21136 -16.038,-23.328 -13.25322,-0.0875 -25.47126,1.07892 -37.908,-4.855139 -6.86718,-3.26592 -11.19744,-6.03612 -10.206,-14.09886 17.30646,4.06782 34.07346,18.691559 52.488,10.67256 2.87226,-1.25388 6.00696,-2.97432 8.12106,-5.33628 9.85608,-10.96416 -5.4675,-34.21926 13.74894,-37.41228 z m 8.748,48.114 c -7.0713,2.259899 -7.15878,4.621859 -7.29,11.663999 0,0 0,34.992 0,34.992 0,0 -1.32678,14.58 -1.32678,14.58 0,0 -2.79936,42.282 -2.79936,42.282 0,0 -3.16386,37.908 -3.16386,37.908 2.02662,-0.67068 3.09096,-0.61236 4.78224,-2.31822 3.90744,-3.98034 7.12962,-24.97554 7.93152,-31.21578 3.44088,-27.03132 1.86624,-78.39666 1.86624,-107.891999 z" + style="fill:#ffffff;stroke:none" /> diff --git a/icons/heures/hd08.svg b/icons/heures/hd08.svg index 8b9305a7..d3369816 100644 --- a/icons/heures/hd08.svg +++ b/icons/heures/hd08.svg @@ -7,9 +7,9 @@ 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="23.993853mm" - height="21.25292mm" - viewBox="0 0 136.02112 120.48278" + width="200" + height="200" + viewBox="0 0 299.98452 299.98453" version="1.1" id="svg3" sodipodi:docname="hd08.svg" @@ -22,7 +22,7 @@ image/svg+xml - + @@ -37,23 +37,24 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1742" - inkscape:window-height="1326" + inkscape:window-width="3840" + inkscape:window-height="2066" id="namedview5" showgrid="false" inkscape:zoom="6.0476878" inkscape:cx="48.669177" - inkscape:cy="32.612614" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="0" + inkscape:cy="85.525398" + inkscape:window-x="-11" + inkscape:window-y="-11" + inkscape:window-maximized="1" inkscape:current-layer="svg3" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + units="px" /> + stroke-width="1.77156" + d="m 29.507423,138.78717 c 3.277388,-9.44243 16.121205,-10.75338 24.801853,-13.57017 0,0 17.715611,-5.91701 17.715611,-5.91701 10.700229,-1.45268 19.044281,5.65128 20.231226,15.94405 1.29324,5.59813 -0.03543,8.92867 0,14.17249 -1.169229,9.46013 4.180885,20.19579 15.199997,16.75896 8.96409,-2.81678 29.40791,-19.00884 42.51746,-20.10722 10.41678,-0.88577 19.34545,2.97623 21.75477,13.97763 2.28531,10.48764 -8.43263,30.04567 -9.1944,42.51745 -1.98414,32.49044 44.46616,56.21164 71.12816,22.87086 16.93612,-21.17016 22.03821,-55.66244 3.96829,-77.71838 -9.47784,-11.58601 -24.85499,-18.79626 -38.05313,-25.2979 -16.06804,-7.91887 -48.00928,-22.46338 -41.08248,-45.635401 1.73613,-5.828436 6.6965,-12.755238 11.47972,-16.475518 3.43683,-2.675057 11.17855,-5.793004 15.43029,-7.582281 16.90069,-7.086244 47.83213,-16.599527 62.97898,-1.116083 5.36783,5.474124 2.3916,10.682514 -2.94079,14.615379 -8.73379,6.430766 -22.62283,11.798595 -33.4648,12.330064 1.55898,-3.808857 5.52728,-10.239622 4.51749,-14.101625 -3.47226,-13.268993 -30.27597,-7.529135 -31.97665,7.015381 -1.47041,12.489505 19.41628,29.779944 29.23072,34.970604 19.23917,10.16877 48.91281,19.9655 55.55616,42.97808 1.36411,4.69464 1.18696,11.01911 1.1338,15.94405 -0.15943,13.46386 -3.04708,30.61256 -9.4247,42.51745 -13.269,24.731 -52.13703,50.64893 -80.92489,48.73566 -7.77716,-0.51376 -20.10722,-5.59814 -26.57342,-9.93847 -19.15057,-12.89696 -16.51094,-28.46898 -10.66479,-47.65499 2.24988,-7.40512 7.08624,-21.38274 2.4979,-28.23867 -5.54499,-8.29091 -12.43636,-6.53707 -20.17808,-3.10024 -8.5035,3.77343 -31.073183,15.80232 -38.974345,16.75897 -28.468986,3.50769 -11.196266,-30.32912 -22.162228,-43.63355 -8.592073,-10.41678 -23.455467,-3.57855 -34.527724,-2.01957 z" + style="fill:#ffffff;stroke:none" /> diff --git a/icons/heures/hd09.svg b/icons/heures/hd09.svg index cf182fb4..32a9fa53 100644 --- a/icons/heures/hd09.svg +++ b/icons/heures/hd09.svg @@ -7,9 +7,9 @@ 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="21.574703mm" - height="28.902678mm" - viewBox="0 0 122.30709 163.84944" + width="200" + height="200" + viewBox="0 0 299.98483 299.9849" version="1.1" id="svg3" sodipodi:docname="hd09.svg" @@ -22,6 +22,7 @@ image/svg+xml + @@ -36,23 +37,24 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1547" - inkscape:window-height="1228" + inkscape:window-width="3840" + inkscape:window-height="2066" id="namedview5" showgrid="false" inkscape:zoom="6.6899283" inkscape:cx="38.540024" - inkscape:cy="53.627296" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="0" + inkscape:cy="89.50212" + inkscape:window-x="-11" + inkscape:window-y="-11" + inkscape:window-maximized="1" inkscape:current-layer="svg3" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + units="px" /> + stroke-width="1.7424" + d="m 200.78959,86.416053 c 0,-7.736255 0.90605,-24.864046 -1.75982,-31.363198 -5.34917,-13.068 -22.59893,-21.083041 -34.25558,-8.520336 -15.64676,16.849007 -21.44895,52.324261 -21.4838,74.731531 -0.0523,32.89651 2.42194,70.89824 -12.66724,101.05919 -6.95218,13.90435 -16.97098,22.42469 -26.136,34.848 0,0 -20.351232,29.53368 -20.351232,29.53368 -2.26512,3.22344 -5.122661,7.91049 -9.705173,5.24462 C 70.893673,289.87609 63.854377,276.9649 61.397593,272.85284 46.622041,248.23273 44.56601,236.69804 43.52057,208.38404 41.412265,150.65834 80.180665,71.657926 129.35119,41.218199 c 18.26036,-11.290753 24.14967,-6.952177 33.1056,-10.576369 12.6324,-5.105232 26.60645,-25.8397897 47.0448,-23.1564937 24.88146,3.2582877 22.45953,32.5306067 47.04479,35.3707187 -2.5439,2.892384 -3.58934,4.286304 -7.03929,6.324912 -20.92623,12.336192 -30.89276,-19.201249 -43.55999,-23.836033 -3.97267,-1.585582 -6.51658,-0.731806 -10.38471,0 8.17186,15.995233 22.05879,27.686737 14.60132,47.13192 -2.59618,6.760512 -3.95525,9.147599 -9.37412,13.939199 z m -52.272,-43.559998 C 125.62246,47.525687 114.29686,61.203527 101.22886,79.446454 75.319369,115.5664 65.248297,145.27432 61.955161,189.21764 c -1.04544,13.99147 4.913568,40.47595 9.461232,54.0144 1.637856,4.87872 5.523408,14.51419 11.203637,15.66417 5.087805,1.0106 11.447561,-4.82644 14.862671,-8.03246 12.318769,-11.48242 17.423999,-21.2747 21.867119,-37.25251 6.8999,-24.91632 4.73933,-65.53166 4.77417,-92.34719 0.0349,-17.00583 3.43253,-35.196477 10.90743,-50.529596 0,0 15.22857,-26.135999 15.22857,-26.135999 0,0 -1.7424,-1.7424 -1.7424,-1.7424 z M 92.760795,222.32324 c -1.812096,-7.16127 -2.230272,-9.5832 5.227196,-12.1968 0.20909,7.02187 -0.1045,7.4052 -5.227196,12.1968 z" + style="fill:#ffffff;stroke:none" /> diff --git a/icons/heures/hd10.svg b/icons/heures/hd10.svg index c89ea403..07829b2b 100644 --- a/icons/heures/hd10.svg +++ b/icons/heures/hd10.svg @@ -7,9 +7,9 @@ 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="28.400057mm" - height="31.803743mm" - viewBox="0 0 160.99999 180.29552" + width="200" + height="200" + viewBox="0 0 299.98471 299.98475" version="1.1" id="svg3" sodipodi:docname="hd10.svg" @@ -22,6 +22,7 @@ image/svg+xml + @@ -36,23 +37,24 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1980" - inkscape:window-height="1320" + inkscape:window-width="3840" + inkscape:window-height="2066" id="namedview5" showgrid="false" - inkscape:zoom="6.4889405" - inkscape:cx="12.978181" - inkscape:cy="59.045906" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:window-maximized="0" + inkscape:zoom="3.2444703" + inkscape:cx="-10.243748" + inkscape:cy="69.07271" + inkscape:window-x="-11" + inkscape:window-y="-11" + inkscape:window-maximized="1" inkscape:current-layer="svg3" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + units="px" /> + stroke-width="1.6" + d="m 45.192365,51.028774 c 15.536,-11.632 16.304,-0.208 30.4,12.528 9.952,8.976 26.256005,16.944 40.000005,15.744 31.18399,-2.688 39.82399,-21.488 49.10399,-47.472 2.384,-6.64 9.584,-28.2879985 19.2,-25.8879985 5.024,1.264 3.6,11.0399995 2.88,14.6879995 -4.016,20.111999 -5.968,30.591999 -1.328,51.199999 5.36,23.776 29.376,48.976006 54.944,47.936006 11.632,-0.464 25.808,-6.992 38.4,-9.536 -3.312,10.08 -15.264,12.048 -24,16.432 -12.832,6.432 -28.768,17.6 -36.256,29.968 -12.352,20.39999 1.024,52.95999 13.44,70.39999 5.056,7.088 13.776,18.992 1.808,25.296 -8.496,4.464 -18.4,-8.72 -23.792,-14.096 -13.36,-13.296 -25.408,-22.96 -44.8,-14.096 -11.776,5.376 -23.328,17.408 -26.64,30.096 -6.672,25.536 0.32,39.44 -21.11999,40 0,0 0,-14.4 0,-14.4 1.79199,-10.88 8.17599,-24.496 5.24799,-35.2 -1.744,-6.416 -7.07199,-12.768 -11.95199,-17.12 -28.688005,-25.616 -60.432005,-6.624 -89.536004,5.92 4.384,-8.848 11.663999,-12.304 19.199999,-18.32 11.36,-9.072 19.76,-16.528 28.768,-28.08 5.344,-6.832 11.088,-15.824 14.032,-24 9.936,-27.51999 -5.04,-59.99999 -19.472,-83.199996 0,0 -18.528,-28.8 -18.528,-28.8 z m 107.199995,36.8 c -9.696,0.24 -36.84799,7.136 -36.54399,19.232006 0.192,7.104 9.18399,17.536 14.28799,22.128 2.752,2.496 6.56,5.424 10.384,3.312 4.48,-2.464 8.544,-21.536 10.032,-27.072 2.08,-7.776006 2.608,-9.552006 1.84,-17.600006 z m 17.6,22.400006 c 0,0 -7.664,28.8 -7.664,28.8 -0.656,3.2 -2.128,9.04 0,11.84 2.528,3.36 7.776,1.12 10.864,0 0,0 27.168,-11.408 27.168,-11.408 2.928,-1.424 7.024,-3.152 7.024,-7.024 0,-7.072 -15.824,-13.472 -21.392,-16.976 -7.168,-4.512 -7.52,-4.944 -16,-5.232 z m -73.599995,73.59999 c 7.088005,-1.104 30.127995,-8.848 33.423995,-15.024 4.048,-7.584 -8.352,-21.87199 -14.22399,-25.61599 -3.152,-2.016 -4.528,-2 -8,-2.56 0,0 -5.504,25.59999 -5.504,25.59999 0,0 -5.696005,17.6 -5.696005,17.6 z m 91.199995,0 c 0,0 1.44,-9.6 1.44,-9.6 1.28,-22.87999 -26.08,-2.64 -9.136,7.504 2.704,1.616 4.736,1.68 7.696,2.096 z m -61.008,6.688 c -5.904,-0.208 -16.38399,3.232 -18.59199,9.472 -2.32,6.528 6.88,12.704 12.36799,13.52 10.288,1.536 15.808,-17.616 6.224,-22.992 z m 27.712,3.952 c -9.712,6.112 -7.408,22.32 -4.144,24.32 2.656,1.632 10.64,-1.232 13.408,-2.4 15.408,-6.496 2.784,-22.88 -9.264,-21.92 z" + style="fill:#ffffff;stroke:none" /> diff --git a/icons/heures/hd11.svg b/icons/heures/hd11.svg index 3e30dff7..c509ab63 100644 --- a/icons/heures/hd11.svg +++ b/icons/heures/hd11.svg @@ -7,9 +7,9 @@ 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="17.601524mm" - height="34.748367mm" - viewBox="0 0 99.782989 196.98869" + width="200" + height="200" + viewBox="0 0 299.98444 299.98488" version="1.1" id="svg3" sodipodi:docname="hd11.svg" @@ -22,6 +22,7 @@ image/svg+xml + @@ -36,23 +37,24 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="2018" - inkscape:window-height="480" + inkscape:window-width="3840" + inkscape:window-height="2066" id="namedview5" showgrid="false" inkscape:zoom="1.6806796" inkscape:cx="404.20909" inkscape:cy="74.67043" - inkscape:window-x="655" - inkscape:window-y="306" - inkscape:window-maximized="0" + inkscape:window-x="-11" + inkscape:window-y="-11" + inkscape:window-maximized="1" inkscape:current-layer="svg3" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + units="px" /> + stroke-width="1.38915" + d="m 141.5067,13.16902 c 4.16745,11.39103 -7.69589,25.338096 -5.00094,37.50705 2.47268,11.224332 11.00207,7.709782 13.25249,14.197113 0,0 0,12.196737 0,12.196737 0,0 3.0978,36.1179 3.0978,36.1179 2.56993,26.61611 7.34861,53.67675 15.51681,79.18155 2.86165,8.91834 5.3899,19.2814 13.44697,24.86578 11.51605,7.95983 34.96491,12.46068 37.47927,27.92192 -11.07153,-0.63901 -12.64127,-4.62587 -22.2264,-8.57106 -3.13948,-1.19467 -7.39028,-2.70884 -10.27971,0 -3.00057,2.63939 -1.79201,7.93205 -0.97241,11.34936 0,0 8.80721,26.39385 8.80721,26.39385 0.88906,3.52844 2.13929,11.83556 -3.29228,12.46067 -5.04262,0.58345 -10.75202,-8.8211 -13.2386,-12.46067 -6.80684,-10.00188 -15.86409,-24.82411 -28.25531,-28.25531 -17.75334,-4.91759 -25.60204,16.48921 -34.72875,21.30956 3.23672,-11.08542 7.15412,-26.94951 18.05895,-32.56168 11.37714,-6.19561 21.93468,0.36118 27.75521,0 3.72293,0.0139 7.1958,-2.18096 6.40399,-6.3623 -1.36137,-7.09856 -20.101,-22.19862 -25.8243,-27.76911 -10.41863,-10.18247 -20.71223,-20.62888 -29.92229,-31.93656 0,0 -9.82129,-13.69702 -9.82129,-13.69702 -6.153941,-7.04299 -12.321762,-3.54233 -17.419943,-11.39103 -2.305989,-3.55622 -2.556036,-8.29323 -3.15337,-12.419 -1.444715,-10.01577 0.09724,-36.562432 6.140043,-44.4528 -0.08335,9.321193 -1.819787,18.57293 -2.903324,27.783 -0.972405,5.00094 -2.611602,10.71035 0,15.32232 6.195609,9.58514 13.00244,2.87554 18.725744,7.73757 2.6116,2.20875 9.55735,14.78055 12.07171,18.61461 6.8624,10.4603 14.58607,20.37883 23.50442,29.17215 3.12558,3.08391 15.05838,14.47494 18.18397,5.33433 0.97241,-2.80608 -3.01445,-24.29623 -3.70903,-28.94988 0,0 -5.90389,-51.39855 -5.90389,-51.39855 0,0 -2.45879,-25.0047 -2.45879,-25.0047 -3.33396,-9.015584 -13.22471,-9.946314 -15.37789,-22.2264 -1.83368,-10.418625 4.43139,-23.559984 7.76535,-33.3396 0,0 4.27858,-16.6698 4.27858,-16.6698 z" + style="fill:#ffffff;stroke:none" /> diff --git a/icons/heures/hd12.svg b/icons/heures/hd12.svg index 7fa312e3..cb8ac1d6 100644 --- a/icons/heures/hd12.svg +++ b/icons/heures/hd12.svg @@ -7,9 +7,9 @@ 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="51.0345mm" - height="43.667892mm" - viewBox="0 0 289.31451 247.55323" + width="200" + height="200" + viewBox="0 0 299.9845 299.98451" version="1.1" id="svg3" sodipodi:docname="hd12.svg" @@ -22,7 +22,7 @@ image/svg+xml - + @@ -37,23 +37,24 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1677" - inkscape:window-height="1195" + inkscape:window-width="3840" + inkscape:window-height="2066" id="namedview5" showgrid="false" - inkscape:zoom="3.0238439" - inkscape:cx="204.69352" - inkscape:cy="115.69427" - inkscape:window-x="984" - inkscape:window-y="92" - inkscape:window-maximized="0" + inkscape:zoom="2.3075" + inkscape:cx="101.45835" + inkscape:cy="293.77361" + inkscape:window-x="-11" + inkscape:window-y="-11" + inkscape:window-maximized="1" inkscape:current-layer="svg3" - inkscape:document-rotation="0" /> + inkscape:document-rotation="0" + units="px" /> + stroke-width="1.25226" + d="m 121.24318,89.911785 c 1.90345,-5.985817 8.2399,-11.520819 12.46002,-16.279419 0,0 21.40118,-25.045261 21.40118,-25.045261 2.51704,-2.642275 8.80341,-9.61738 12.35982,-9.980537 3.84446,-0.400724 9.86784,8.390163 12.29722,11.232799 8.55296,9.980539 29.85396,27.649969 32.89697,38.820156 0,0 -32.55885,3.756788 -32.55885,3.756788 5.37222,6.449154 8.89108,7.025195 9.7927,16.279419 0.80146,8.20232 -3.69418,17.40645 2.35426,24.70714 4.83374,5.82303 15.89121,7.10034 21.17576,1.40254 3.23085,-3.48129 4.43301,-8.61557 8.26493,-11.40812 2.98039,-2.17893 6.26132,-2.12884 9.75515,-2.17893 0,0 31.30656,1.25226 31.30656,1.25226 0,0 -1.23974,18.78395 -1.23974,18.78395 -0.31306,13.98777 3.74427,36.92923 5.72285,51.34278 0,0 0.80144,8.76584 0.80144,8.76584 1.82831,10.46891 13.56201,15.03967 12.0092,28.80203 -1.54027,13.69977 -14.73913,21.97723 -27.31185,23.793 3.90705,-8.26492 8.89107,-9.86782 11.79631,-16.2794 6.41159,-14.18814 -13.28651,-32.09551 -26.82345,-31.18135 -7.6764,0.5009 -16.89305,6.3114 -23.25455,1.11452 -4.80867,-3.91959 -1.07694,-8.5655 -6.36149,-16.26692 -10.4063,-15.15237 -32.28333,-24.94506 -50.52881,-23.68029 -15.56563,1.07696 -32.45865,9.99307 -45.08147,18.69629 -3.93211,2.71742 -15.415353,11.97165 -18.78394,12.9985 -7.075287,2.16642 -11.746227,-4.82122 -18.783945,-8.11468 -11.270369,-5.28454 -18.721333,-1.65297 -27.499696,5.88565 -12.347313,10.59414 -19.435123,28.07574 -7.300695,41.75044 8.427732,9.50469 18.771424,9.2918 16.442215,16.11664 -2.066235,6.06095 -13.912643,7.1379 -19.209716,5.98581 -11.33298,-2.45443 -17.38141,-13.71228 -17.531682,-24.55688 -0.237929,-17.4941 4.119946,-26.73581 17.531682,-38.457 0,0 17.882317,-14.51373 17.882317,-14.51373 3.882014,-5.17184 5.873114,-26.46031 5.910682,-33.43542 0.02505,-4.55823 1.076946,-25.58372 2.366776,-28.75195 0.876585,-2.14137 2.028666,-3.66913 4.057333,-4.84626 2.679842,-1.52776 14.050391,-1.91596 18.621151,-2.86768 3.781834,-0.78893 11.295412,-4.11994 14.638948,-2.21651 5.24698,2.99291 1.40254,15.76599 3.64409,20.97541 2.19146,5.10923 9.55477,5.12175 14.2758,5.18436 3.91958,0.0375 10.18091,0.30055 13.59959,-1.64046 7.11285,-4.04481 6.04842,-23.20443 8.69068,-30.86828 2.47949,-7.187987 6.22376,-4.90887 10.26856,-12.572719 -15.79102,-3.180748 -14.20065,-2.504526 -30.05431,-2.504526 z m 62.61314,-6.261315 c -0.20034,-2.416867 -0.13774,-3.969674 -1.2773,-6.261315 -2.52957,-5.059143 -12.54767,-14.939497 -18.7589,-13.887596 -8.79089,1.477669 -18.95926,12.297222 -22.54073,20.148911 9.45459,3.719221 31.29405,0 42.57693,0 z m 47.58602,116.46046 c 4.27021,0 12.59776,0.76387 15.89119,-2.00362 3.65663,-3.08057 2.70492,-7.66386 1.90345,-11.77128 0,0 0,-22.54073 0,-22.54073 0,0 -1.28983,-17.53168 -1.28983,-17.53168 0.2755,-3.90706 1.72813,-9.75513 0.63865,-13.6121 -1.23973,-4.32031 -5.78544,-5.47239 -9.5798,-3.65661 -7.3007,3.51886 -4.98402,11.54587 -12.62281,15.96636 -8.67819,4.69598 -25.2331,0.93919 -35.01329,0 -4.97147,-0.23794 -10.51899,-0.10018 -14.15056,-4.23266 -4.19507,-4.74608 -3.31849,-13.54948 -3.38111,-19.51025 -0.0877,-6.79979 -1.61543,-22.240191 -12.38488,-17.69448 -5.1969,2.17894 -4.84627,6.76222 -5.34716,11.43316 -0.93921,8.51539 -0.16279,25.33328 -8.61558,29.51584 -2.91777,1.4401 -22.40298,3.11813 -26.24743,2.99291 0,0 -12.52263,-1.20217 -12.52263,-1.20217 -4.72103,-0.22541 -12.409921,-0.65118 -15.891212,-4.14498 -5.747888,-5.78547 0.400725,-17.63188 -7.976916,-20.33676 -5.221935,-1.69056 -8.47782,4.13246 -9.730083,8.20232 -1.85335,6.09852 -3.882015,25.90932 -3.969673,32.55884 -0.05008,4.5958 -0.42577,10.83207 1.815781,14.90192 4.846258,8.75331 19.334942,11.45821 28.238523,8.84098 14.11301,-4.14499 18.29557,-12.61028 36.31564,-21.06306 22.0273,-9.86784 49.4769,-11.2328 71.37899,0 13.12372,6.38653 22.35289,14.35093 22.54074,29.879 0,0 0,5.00905 0,5.00905 z" + style="fill:#ffffff;stroke:none" /> diff --git a/module/rdd-calendrier.js b/module/rdd-calendrier.js index 11e1e5a5..a371edf8 100644 --- a/module/rdd-calendrier.js +++ b/module/rdd-calendrier.js @@ -1,21 +1,23 @@ /* -------------------------------------------- */ import { RdDCalendrierEditeur } from "./rdd-calendrier-editeur.js"; import { RdDAstrologieEditeur } from "./rdd-astrologie-editeur.js"; +import { HtmlUtility } from "./html-utility.js"; /* -------------------------------------------- */ +const dossierIconesHeures = 'systems/foundryvtt-reve-de-dragon/icons/heures/' const heuresList = [ "vaisseau", "sirene", "faucon", "couronne", "dragon", "epees", "lyre", "serpent", "poissonacrobate", "araignee", "roseau", "chateaudormant" ]; -const heuresDef = { "vaisseau": { label: "Vaisseau", lettreFont: 'v', saison: "printemps" }, - "sirene": { label: "Sirène", lettreFont: 'S', saison: "printemps"}, - "faucon": {label: "Faucon", lettreFont: 'f', saison: "printemps"}, - "couronne": {label: "Couronne", lettreFont: 'C', saison: "ete"}, - "dragon": {label: "Dragon", lettreFont: 'd', saison: "ete"}, - "epees": {label: "Epées", lettreFont: 'e', saison: "ete"}, - "lyre": {label: "Lyre", lettreFont: 'l', saison: "automne"}, - "serpent": {label: "Serpent", lettreFont: 's', saison: "automne"}, - "poissonacrobate": {label: "Poisson Acrobate", lettreFont: 'p', saison: "automne"}, - "araignee": {label: "Araignée", lettreFont: 'a', saison: "hiver"}, - "roseau": {label: "Roseau", lettreFont: 'r', saison: "hiver"}, - "chateaudormant": {label: "Château Dormant", lettreFont: 'c', saison: "hiver"} +const heuresDef = { "vaisseau": { label: "Vaisseau", lettreFont: 'v', saison: "printemps", heure: 0, icon: 'hd01.svg' }, + "sirene": { label: "Sirène", lettreFont: 'S', saison: "printemps", heure: 1, icon: 'hd02.svg' }, + "faucon": { label: "Faucon", lettreFont: 'f', saison: "printemps", heure: 2, icon: 'hd03.svg' }, + "couronne": { label: "Couronne", lettreFont: 'C', saison: "ete", heure: 3, icon: 'hd04.svg' }, + "dragon": { label: "Dragon", lettreFont: 'd', saison: "ete", heure: 4, icon: 'hd05.svg' }, + "epees": { label: "Epées", lettreFont: 'e', saison: "ete", heure: 5, icon: 'hd06.svg' }, + "lyre": { label: "Lyre", lettreFont: 'l', saison: "automne", heure: 6, icon: 'hd07.svg' }, + "serpent": { label: "Serpent", lettreFont: 's', saison: "automne", heure: 7, icon: 'hd08.svg' }, + "poissonacrobate": { label: "Poisson Acrobate", lettreFont: 'p', saison: "automne", heure: 8, icon: 'hd09.svg' }, + "araignee": { label: "Araignée", lettreFont: 'a', saison: "hiver", heure: 9, icon: 'hd10.svg' }, + "roseau": { label: "Roseau", lettreFont: 'r', saison: "hiver", heure: 10, icon: 'hd11.svg' }, + "chateaudormant": { label: "Château Dormant", lettreFont: 'c', saison: "hiver", heure: 11, icon: 'hd12.svg' } }; const saisonsDef = { "printemps": { label: "Printemps"}, "ete": { label: "Eté"}, @@ -74,7 +76,7 @@ export class RdDCalendrier extends Application { getDateFromIndex( index ) { let month = Math.ceil(index / 28); let day = index - (month*28); - return day+"/"+heuresList[month]; + return day + "/" + heuresList[month]; } /* -------------------------------------------- */ @@ -177,16 +179,22 @@ export class RdDCalendrier extends Application { fillCalendrierData( data = {} ) { let moisKey = heuresList[this.calendrier.moisRdD]; let heureKey = heuresList[this.calendrier.heureRdD]; + + const mois = heuresDef[moisKey]; + const heure = heuresDef[heureKey]; + //console.log(moisKey, heureKey); data.heureKey = heureKey; data.moisKey = moisKey; - data.nomMois = heuresDef[moisKey].label; // heures et mois nommés identiques + data.nomMois = mois.label; // heures et mois nommés identiques + data.iconMois = dossierIconesHeures + mois.icon; data.jourMois = this.calendrier.jour; - data.nomHeure = heuresDef[heureKey].label; - data.nomSaison = saisonsDef[heuresDef[moisKey].saison].label; + data.nomHeure = heure.label; + data.iconHeure = dossierIconesHeures + heure.icon; + data.nomSaison = saisonsDef[mois.saison].label; data.heuresRelative = this.calendrier.heuresRelative; data.minutesRelative = this.calendrier.minutesRelative; - data.lettreFont = heuresDef[heureKey].lettreFont; + data.lettreFont = heure.lettreFont; data.isGM = game.user.isGM; return data; } @@ -228,10 +236,9 @@ export class RdDCalendrier extends Application { let data = this.fillCalendrierData( ); // Rebuild data document.getElementById("calendar--move-handle").innerHTML = `Jour ${data.jourMois} de ${data.nomMois} (${data.nomSaison})` + " - NA: "+this.getCurrentNombreAstral(); - document.getElementById("calendar-heure-texte").innerHTML = ` - ${data.nomHeure}`; + document.getElementById("calendar-heure-texte").innerHTML = `${data.nomHeure}`; document.getElementById("calendar-time").innerHTML = `${data.heuresRelative}:${data.minutesRelative}`; - document.getElementById("calendar-icone-heure").innerHTML = data.lettreFont; - + document.getElementById("calendar-heure-img").src = data.iconHeure; } /* -------------------------------------------- */ @@ -283,6 +290,8 @@ export class RdDCalendrier extends Application { activateListeners(html) { super.activateListeners(html); + HtmlUtility._showControlWhen(".gm-only", game.user.isGM); + this.updateDisplay(); html.find('#calendar-btn-1min').click(ev => { diff --git a/styles/simple.css b/styles/simple.css index 1a0ae392..d50d7bf7 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -930,7 +930,6 @@ ul, li { color: #CCC; cursor: pointer; } - #calendar-date, #calendar-date-num { transition: 0.2s; @@ -947,10 +946,12 @@ ul, li { opacity: 0; cursor: pointer; } -#calendar-icone-heure { - font-family: "heures Draconiques"; +#calendar-heure-img{ + width: 24px; + height: 24px; + flex-grow: 0; + border-width: 0; opacity: 90; - font-size: 1.25rem; color: #CCC; } #calendar-hdr:hover #calendar-date { diff --git a/templates/calendar-template.html b/templates/calendar-template.html index a5feef09..e57f10db 100644 --- a/templates/calendar-template.html +++ b/templates/calendar-template.html @@ -18,8 +18,8 @@ {{/if}}
-

H {{nomHeure}}

-

{{heuresRelative}}:{{minutesRelative}} - N. Astral: 1

 +

{{nomHeure}} {{nomHeure}}

+

{{heuresRelative}}:{{minutesRelative}}
{{#if isGM}}
From ec82c5baf6212df4c566dd6f09574a0f5e016e1f Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Fri, 11 Dec 2020 02:31:58 +0100 Subject: [PATCH 2/5] fix - nombre astral inconnu --- module/rdd-calendrier.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/module/rdd-calendrier.js b/module/rdd-calendrier.js index a371edf8..95e25bda 100644 --- a/module/rdd-calendrier.js +++ b/module/rdd-calendrier.js @@ -95,8 +95,12 @@ export class RdDCalendrier extends Application { /* -------------------------------------------- */ getCurrentNombreAstral() { - let index = this.getCurrentDayIndex(); - return this.listeNombreAstral[index].nombreAstral; + if (this.listeNombreAstral) + { + let index = this.getCurrentDayIndex(); + return this.listeNombreAstral[index].nombreAstral; + } + return '?'; } /* -------------------------------------------- */ From f97914a63efbb3d9ae29923b81d218360d2614cc Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Fri, 11 Dec 2020 02:31:33 +0100 Subject: [PATCH 3/5] fix async sur appelChance --- module/actor.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/actor.js b/module/actor.js index d2419f50..9ac60848 100644 --- a/module/actor.js +++ b/module/actor.js @@ -1479,14 +1479,14 @@ export class RdDActor extends Actor { label: 'Appel à la chance', callbacks: [ this._createCallbackExperience(), - { action: this._appelChanceResult } + { action: r => this._appelChanceResult(r) } ] } ); dialog.render(true); } - _appelChanceResult(rollData) { + async _appelChanceResult(rollData) { const message = { user: game.user._id, alias: this.name, @@ -1494,7 +1494,7 @@ export class RdDActor extends Actor { }; if (rollData.rolled.isSuccess) { message.content += "
Un point de chance est dépensée, l'action peut être retentée" - this.chanceActuelleIncDec(-1) + await this.chanceActuelleIncDec(-1) } ChatMessage.create(message); } From 02f04791b9e1f8184ce62236cd234b1b4192553f Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Fri, 11 Dec 2020 02:48:35 +0100 Subject: [PATCH 4/5] selection de l'heure de naissance --- module/actor-sheet.js | 4 ++++ template.json | 2 +- templates/actor-sheet.html | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/module/actor-sheet.js b/module/actor-sheet.js index 6417eb88..4f53555e 100644 --- a/module/actor-sheet.js +++ b/module/actor-sheet.js @@ -204,6 +204,10 @@ export class RdDActorSheet extends ActorSheet { // Everything below here is only needed if the sheet is editable if (!this.options.editable) return; + $(function () { + $("#data.heure").val(this.actor.data.data.heure); + }); + // Update Inventory Item html.find('.item-edit').click(ev => { const li = $(ev.currentTarget).parents(".item"); diff --git a/template.json b/template.json index 35a0573e..5ff788c2 100644 --- a/template.json +++ b/template.json @@ -13,7 +13,7 @@ "yeux": "", "cheveux": "", "poids": "", - "heure": 0, + "heure": "", "sexe": "", "age": 0, "beaute": 10, diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index f2c722f9..749f069c 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -640,7 +640,11 @@
  • From a75157226edda3bc35af961db3f0ecfbe5b39ce8 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Fri, 11 Dec 2020 03:23:34 +0100 Subject: [PATCH 5/5] Chiffre astral ajuste la chance --- module/actor-sheet.js | 4 ---- module/actor.js | 10 ++++------ module/rdd-calendrier.js | 21 +++++++++++++++++++-- module/rdd-roll.js | 8 +++++--- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/module/actor-sheet.js b/module/actor-sheet.js index 4f53555e..6417eb88 100644 --- a/module/actor-sheet.js +++ b/module/actor-sheet.js @@ -204,10 +204,6 @@ export class RdDActorSheet extends ActorSheet { // Everything below here is only needed if the sheet is editable if (!this.options.editable) return; - $(function () { - $("#data.heure").val(this.actor.data.data.heure); - }); - // Update Inventory Item html.find('.item-edit').click(ev => { const li = $(ev.currentTarget).parents(".item"); diff --git a/module/actor.js b/module/actor.js index 9ac60848..e71698ad 100644 --- a/module/actor.js +++ b/module/actor.js @@ -17,6 +17,7 @@ import { RdDRollTables } from "./rdd-rolltables.js"; import { ChatUtility } from "./chat-utility.js"; import { RdDItemSort } from "./item-sort.js"; import { Grammar } from "./grammar.js"; +import { RdDCalendrier } from "./rdd-calendrier.js"; export class RdDActor extends Actor { @@ -1467,10 +1468,7 @@ export class RdDActor extends Actor { /* -------------------------------------------- */ async rollAppelChance( ) { - let rollData = { - selectedCarac: this.getCaracByName('chance-actuelle'), - diffConditions: this.ajustementAstrologique() - } + let rollData = { selectedCarac: this.getCaracByName('chance-actuelle') }; const dialog = await RdDRoll.create(this, rollData, { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-carac.html'}, @@ -1508,8 +1506,8 @@ export class RdDActor extends Actor { /* -------------------------------------------- */ ajustementAstrologique() { - //TODO: selon heure et heure de naissance... - return 0; + // selon l'heure de naissance... + return game.system.rdd.calendrier.getAjustementAstrologique(this.data.data.heure); } /* -------------------------------------------- */ diff --git a/module/rdd-calendrier.js b/module/rdd-calendrier.js index 95e25bda..32682b99 100644 --- a/module/rdd-calendrier.js +++ b/module/rdd-calendrier.js @@ -85,7 +85,7 @@ export class RdDCalendrier extends Application { } /* -------------------------------------------- */ - ajouterNombreAstral(index) { + ajouterNombreAstral(index) { return { nombreAstral: new Roll("1d12").roll().total, valeursFausses: [], @@ -100,7 +100,7 @@ export class RdDCalendrier extends Application { let index = this.getCurrentDayIndex(); return this.listeNombreAstral[index].nombreAstral; } - return '?'; + return 0; } /* -------------------------------------------- */ @@ -203,6 +203,23 @@ export class RdDCalendrier extends Application { return data; } + getAjustementAstrologique(heureNaissance) + { + let hn = heuresDef[heureNaissance].heure; + let chiffreAstral = this.getCurrentNombreAstral(); + let heureCourante = this.calendrier.heureRdD; + let ecartChance = (hn + chiffreAstral - heureCourante)%12; + console.log("ajustementAstrologique", heureNaissance, hn, chiffreAstral, heureCourante, ecartChance); + switch (ecartChance) + { + case 0: return 4; + case 4: case 8: return 2; + case 6: return -4; + case 3: case 9: return -2; + } + return 0; + } + /* -------------------------------------------- */ getData() { let data = super.getData(); diff --git a/module/rdd-roll.js b/module/rdd-roll.js index 3cc84e04..de8c7c2c 100644 --- a/module/rdd-roll.js +++ b/module/rdd-roll.js @@ -40,7 +40,8 @@ export class RdDRoll extends Dialog { surencMalusApply: false, isNatation: rollData.competence ? rollData.competence.name.toLowerCase().includes("natation") : false, useEncForNatation: false, - encValueForNatation: actor.encombrementTotal ? Math.floor(actor.encombrementTotal) : 0 + encValueForNatation: actor.encombrementTotal ? Math.floor(actor.encombrementTotal) : 0, + ajustementAstrologique: actor.ajustementAstrologique() }, { overwrite: false }); } @@ -199,7 +200,7 @@ export class RdDRoll extends Dialog { let malusEnc = (rollData.surencMalusApply) ? rollData.surencMalusValue : 0; let diffLibre = Misc.toInt(rollData.diffLibre); let malusEncNatation = (rollData.useEncForNatation) ? -rollData.encValueForNatation : 0; - + let ajustementChance = rollData.selectedCarac.label.toLowerCase().includes('chance') ? rollData.ajustementAstrologique : 0; // Gestion malus armure let malusArmureValue = 0; if (rollData.malusArmureValue != 0 && (rollData.selectedCarac.label == "Agilité" || rollData.selectedCarac.label == "Dérobée")) { @@ -209,6 +210,7 @@ export class RdDRoll extends Dialog { $("#addon-message").text(""); } + let diffCompetence = 0; if (rollData.competence) { diffCompetence = Misc.toInt(rollData.competence.data.niveau); @@ -218,7 +220,7 @@ export class RdDRoll extends Dialog { diffLibre = RdDItemSort.getDifficulte(rollData.selectedSort, diffLibre); } - return etat + diffCompetence + diffLibre + diffConditions + malusEnc + malusEncNatation + malusArmureValue; + return etat + diffCompetence + diffLibre + diffConditions + malusEnc + malusEncNatation + malusArmureValue + ajustementChance; } /* -------------------------------------------- */