From a3c5a9bfec6a2443e96520e0e1eb28650c52cfa4 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Tue, 28 Nov 2023 22:27:31 +0100 Subject: [PATCH] Compendiums : Armes et protections --- modules/wasteland-actor-sheet.js | 2 ++ modules/wasteland-actor.js | 10 ++++++ modules/wasteland-config.js | 4 +++ packs/armes/000012.log | 0 packs/armes/CURRENT | 2 +- packs/armes/LOG | 16 ++++----- packs/armes/LOG.old | 16 ++++----- packs/armes/MANIFEST-000010 | Bin 134 -> 0 bytes packs/equipement/000072.log | 0 packs/equipement/CURRENT | 2 +- packs/equipement/LOG | 16 ++++----- packs/equipement/LOG.old | 16 ++++----- packs/equipement/MANIFEST-000070 | Bin 134 -> 0 bytes packs/heritages/000036.log | 0 packs/heritages/CURRENT | 2 +- packs/heritages/LOG | 16 ++++----- packs/heritages/LOG.old | 16 ++++----- packs/heritages/MANIFEST-000034 | Bin 134 -> 0 bytes packs/metiers/000036.log | 0 packs/metiers/CURRENT | 2 +- packs/metiers/LOG | 16 ++++----- packs/metiers/LOG.old | 16 ++++----- packs/metiers/MANIFEST-000034 | Bin 135 -> 0 bytes packs/origines/000037.log | 0 packs/origines/CURRENT | 2 +- packs/origines/LOG | 16 ++++----- packs/origines/LOG.old | 16 ++++----- packs/origines/MANIFEST-000035 | Bin 169 -> 0 bytes packs/protection/000073.log | 0 packs/protection/CURRENT | 2 +- packs/protection/LOG | 16 ++++----- packs/protection/LOG.old | 16 ++++----- packs/protection/MANIFEST-000071 | Bin 168 -> 0 bytes packs/scenes/000012.log | 0 packs/scenes/CURRENT | 2 +- packs/scenes/LOG | 14 ++++---- packs/scenes/LOG.old | 14 ++++---- packs/scenes/MANIFEST-000010 | Bin 65 -> 0 bytes packs/skills/000073.log | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 16 ++++----- packs/skills/LOG.old | 16 ++++----- packs/skills/MANIFEST-000071 | Bin 168 -> 0 bytes packs/tables/000072.log | 0 packs/tables/CURRENT | 2 +- packs/tables/LOG | 16 ++++----- packs/tables/LOG.old | 16 ++++----- packs/tables/MANIFEST-000070 | Bin 161 -> 0 bytes system.json | 4 +-- template.json | 25 +++++++------ templates/actor-sheet.html | 56 ++++++++++++++++++++++++++++++ templates/item-pouvoir-sheet.html | 2 +- 52 files changed, 240 insertions(+), 165 deletions(-) delete mode 100644 packs/armes/000012.log delete mode 100644 packs/armes/MANIFEST-000010 delete mode 100644 packs/equipement/000072.log delete mode 100644 packs/equipement/MANIFEST-000070 delete mode 100644 packs/heritages/000036.log delete mode 100644 packs/heritages/MANIFEST-000034 delete mode 100644 packs/metiers/000036.log delete mode 100644 packs/metiers/MANIFEST-000034 delete mode 100644 packs/origines/000037.log delete mode 100644 packs/origines/MANIFEST-000035 delete mode 100644 packs/protection/000073.log delete mode 100644 packs/protection/MANIFEST-000071 delete mode 100644 packs/scenes/000012.log delete mode 100644 packs/scenes/MANIFEST-000010 delete mode 100644 packs/skills/000073.log delete mode 100644 packs/skills/MANIFEST-000071 delete mode 100644 packs/tables/000072.log delete mode 100644 packs/tables/MANIFEST-000070 diff --git a/modules/wasteland-actor-sheet.js b/modules/wasteland-actor-sheet.js index 7e63044..da7385d 100644 --- a/modules/wasteland-actor-sheet.js +++ b/modules/wasteland-actor-sheet.js @@ -43,6 +43,8 @@ export class WastelandActorSheet extends ActorSheet { armes: duplicate(this.actor.getWeapons()), protections: duplicate(this.actor.getArmors()), pouvoirs:duplicate(this.actor.getPouvoirs()), + tours:duplicate(this.actor.getTours()), + charmes:duplicate(this.actor.getCharmes()), origine: duplicate(this.actor.getOrigine() || {}), heritage: duplicate(this.actor.getHeritage() || {}), metier: duplicate(this.actor.getMetier() || {}), diff --git a/modules/wasteland-actor.js b/modules/wasteland-actor.js index 7c7785d..6d96c72 100644 --- a/modules/wasteland-actor.js +++ b/modules/wasteland-actor.js @@ -106,6 +106,16 @@ export class WastelandActor extends Actor { WastelandUtility.sortArrayObjectsByName(items) return items } + getCharmes() { + let items = this.items.filter(item => item.type=="charme" && item.system?.charmetype == "charme") || [] + WastelandUtility.sortArrayObjectsByName(items) + return items + } + getTours() { + let items = this.items.filter(item => item.type=="charme" && item.system?.charmetype == "tour") || [] + WastelandUtility.sortArrayObjectsByName(items) + return items + } getPouvoirs() { return this.getItemSorted(["pouvoir"]) } diff --git a/modules/wasteland-config.js b/modules/wasteland-config.js index ae8ae00..5b93d56 100644 --- a/modules/wasteland-config.js +++ b/modules/wasteland-config.js @@ -7,5 +7,9 @@ export const WASTELAND_CONFIG = { "reflet": "Chemin des Reflets", "ame": "Chemin des Âmes", "mort": "Chemin des Morts" + }, + charmetype: { + tour: "Tour", + charme: "Charme", } } diff --git a/packs/armes/000012.log b/packs/armes/000012.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT index 3051f81..8b15215 100644 --- a/packs/armes/CURRENT +++ b/packs/armes/CURRENT @@ -1 +1 @@ -MANIFEST-000010 +MANIFEST-000026 diff --git a/packs/armes/LOG b/packs/armes/LOG index 9be7971..26cd559 100644 --- a/packs/armes/LOG +++ b/packs/armes/LOG @@ -1,8 +1,8 @@ -2023/11/28-21:10:45.936814 7fef577fe6c0 Recovering log #8 -2023/11/28-21:10:45.999576 7fef577fe6c0 Delete type=3 #6 -2023/11/28-21:10:45.999713 7fef577fe6c0 Delete type=0 #8 -2023/11/28-21:42:12.890060 7fef56ffd6c0 Level-0 table #13: started -2023/11/28-21:42:12.890138 7fef56ffd6c0 Level-0 table #13: 0 bytes OK -2023/11/28-21:42:12.896649 7fef56ffd6c0 Delete type=0 #11 -2023/11/28-21:42:12.896958 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/11/28-21:42:12.896986 7fef56ffd6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/11/28-22:25:39.804205 7fef577fe6c0 Recovering log #24 +2023/11/28-22:25:39.814540 7fef577fe6c0 Delete type=3 #22 +2023/11/28-22:25:39.814668 7fef577fe6c0 Delete type=0 #24 +2023/11/28-22:26:01.957988 7fef56ffd6c0 Level-0 table #29: started +2023/11/28-22:26:01.958049 7fef56ffd6c0 Level-0 table #29: 0 bytes OK +2023/11/28-22:26:01.993914 7fef56ffd6c0 Delete type=0 #27 +2023/11/28-22:26:01.994099 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/11/28-22:26:01.994115 7fef56ffd6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) diff --git a/packs/armes/LOG.old b/packs/armes/LOG.old index 07ec71a..355d15c 100644 --- a/packs/armes/LOG.old +++ b/packs/armes/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-21:00:12.498801 7fef57fff6c0 Recovering log #4 -2023/11/28-21:00:12.509763 7fef57fff6c0 Delete type=3 #2 -2023/11/28-21:00:12.509888 7fef57fff6c0 Delete type=0 #4 -2023/11/28-21:10:40.936880 7fef56ffd6c0 Level-0 table #9: started -2023/11/28-21:10:40.936944 7fef56ffd6c0 Level-0 table #9: 0 bytes OK -2023/11/28-21:10:40.985508 7fef56ffd6c0 Delete type=0 #7 -2023/11/28-21:10:41.022162 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/11/28-21:10:41.022261 7fef56ffd6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/11/28-22:14:53.966749 7ff1ed3ff6c0 Recovering log #20 +2023/11/28-22:14:53.976936 7ff1ed3ff6c0 Delete type=3 #18 +2023/11/28-22:14:53.977013 7ff1ed3ff6c0 Delete type=0 #20 +2023/11/28-22:25:36.167685 7fef56ffd6c0 Level-0 table #25: started +2023/11/28-22:25:36.167712 7fef56ffd6c0 Level-0 table #25: 0 bytes OK +2023/11/28-22:25:36.174198 7fef56ffd6c0 Delete type=0 #23 +2023/11/28-22:25:36.174324 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/11/28-22:25:36.174347 7fef56ffd6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) diff --git a/packs/armes/MANIFEST-000010 b/packs/armes/MANIFEST-000010 deleted file mode 100644 index c78bf10532932cbd471655bc63db78bf5b2dcb68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmdn&`6D}#fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ^@OFoVrEHdZn2_4 zae1bzMYd^GTBv7XZbT`gFasFC_`*82D9*D~WX+@_CVw5#~iD!M^Tp{w5V+k&IjrdA^hD;yD-?nUpyh Um{nM~ey1*z0&!J`pgoS$2eSd>_jU&PKN*gu0wUNN&IHMdyN zuqw&V%hNx%s5m4e(c3MQk%a*aVDgm)?gnALm6hogo>?Z5=5CB!5cy-j-m7siFfu7~ WGBB&K2w$H1;xUM;0_3W(2m=7hP$ZfF diff --git a/packs/origines/000037.log b/packs/origines/000037.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/origines/CURRENT b/packs/origines/CURRENT index 29a53d8..29ffc22 100644 --- a/packs/origines/CURRENT +++ b/packs/origines/CURRENT @@ -1 +1 @@ -MANIFEST-000035 +MANIFEST-000051 diff --git a/packs/origines/LOG b/packs/origines/LOG index 1fb4c1e..4f2def1 100644 --- a/packs/origines/LOG +++ b/packs/origines/LOG @@ -1,8 +1,8 @@ -2023/11/28-21:10:45.758372 7fef57fff6c0 Recovering log #33 -2023/11/28-21:10:45.814699 7fef57fff6c0 Delete type=3 #31 -2023/11/28-21:10:45.814832 7fef57fff6c0 Delete type=0 #33 -2023/11/28-21:42:12.875434 7fef56ffd6c0 Level-0 table #38: started -2023/11/28-21:42:12.875457 7fef56ffd6c0 Level-0 table #38: 0 bytes OK -2023/11/28-21:42:12.882108 7fef56ffd6c0 Delete type=0 #36 -2023/11/28-21:42:12.896938 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) -2023/11/28-21:42:12.896971 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/11/28-22:25:39.766917 7ff1ed3ff6c0 Recovering log #49 +2023/11/28-22:25:39.776639 7ff1ed3ff6c0 Delete type=3 #47 +2023/11/28-22:25:39.776769 7ff1ed3ff6c0 Delete type=0 #49 +2023/11/28-22:26:01.835351 7fef56ffd6c0 Level-0 table #54: started +2023/11/28-22:26:01.835379 7fef56ffd6c0 Level-0 table #54: 0 bytes OK +2023/11/28-22:26:01.877912 7fef56ffd6c0 Delete type=0 #52 +2023/11/28-22:26:01.957422 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/11/28-22:26:01.994075 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) diff --git a/packs/origines/LOG.old b/packs/origines/LOG.old index 1fb0394..9009ed1 100644 --- a/packs/origines/LOG.old +++ b/packs/origines/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-21:00:12.454515 7fef577fe6c0 Recovering log #29 -2023/11/28-21:00:12.465532 7fef577fe6c0 Delete type=3 #27 -2023/11/28-21:00:12.465668 7fef577fe6c0 Delete type=0 #29 -2023/11/28-21:10:40.857528 7fef56ffd6c0 Level-0 table #34: started -2023/11/28-21:10:40.857593 7fef56ffd6c0 Level-0 table #34: 0 bytes OK -2023/11/28-21:10:40.899028 7fef56ffd6c0 Delete type=0 #32 -2023/11/28-21:10:41.022100 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) -2023/11/28-21:10:41.022211 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/11/28-22:14:53.927159 7fef57fff6c0 Recovering log #45 +2023/11/28-22:14:53.938168 7fef57fff6c0 Delete type=3 #43 +2023/11/28-22:14:53.938269 7fef57fff6c0 Delete type=0 #45 +2023/11/28-22:25:36.148472 7fef56ffd6c0 Level-0 table #50: started +2023/11/28-22:25:36.148556 7fef56ffd6c0 Level-0 table #50: 0 bytes OK +2023/11/28-22:25:36.154989 7fef56ffd6c0 Delete type=0 #48 +2023/11/28-22:25:36.167674 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/11/28-22:25:36.174315 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) diff --git a/packs/origines/MANIFEST-000035 b/packs/origines/MANIFEST-000035 deleted file mode 100644 index 188bc5d5ff1c1fe9b8784cba9490f47a01c9b35b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmcBr&|A{Nz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&P8Nub5eqnp><`kzZjR zWFA^tT4j*x?qg8EsK5XQ>`Yw!@8PNpDpCTA&CI<5io=RRE6WNP#UZK)nc^)jwVZ>2 Zkx7M?2003CmD>VQB diff --git a/packs/protection/000073.log b/packs/protection/000073.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/protection/CURRENT b/packs/protection/CURRENT index be93edb..d05b681 100644 --- a/packs/protection/CURRENT +++ b/packs/protection/CURRENT @@ -1 +1 @@ -MANIFEST-000071 +MANIFEST-000087 diff --git a/packs/protection/LOG b/packs/protection/LOG index cab967f..1301162 100644 --- a/packs/protection/LOG +++ b/packs/protection/LOG @@ -1,8 +1,8 @@ -2023/11/28-21:10:46.003090 7fef57fff6c0 Recovering log #69 -2023/11/28-21:10:46.055644 7fef57fff6c0 Delete type=3 #67 -2023/11/28-21:10:46.055774 7fef57fff6c0 Delete type=0 #69 -2023/11/28-21:42:12.897082 7fef56ffd6c0 Level-0 table #74: started -2023/11/28-21:42:12.897106 7fef56ffd6c0 Level-0 table #74: 0 bytes OK -2023/11/28-21:42:12.904764 7fef56ffd6c0 Delete type=0 #72 -2023/11/28-21:42:12.925187 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/11/28-21:42:12.925283 7fef56ffd6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/11/28-22:25:39.816638 7ff1ed3ff6c0 Recovering log #85 +2023/11/28-22:25:39.826939 7ff1ed3ff6c0 Delete type=3 #83 +2023/11/28-22:25:39.826992 7ff1ed3ff6c0 Delete type=0 #85 +2023/11/28-22:26:02.073308 7fef56ffd6c0 Level-0 table #90: started +2023/11/28-22:26:02.073355 7fef56ffd6c0 Level-0 table #90: 0 bytes OK +2023/11/28-22:26:02.110214 7fef56ffd6c0 Delete type=0 #88 +2023/11/28-22:26:02.153733 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/11/28-22:26:02.153763 7fef56ffd6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) diff --git a/packs/protection/LOG.old b/packs/protection/LOG.old index a358d90..2215cb5 100644 --- a/packs/protection/LOG.old +++ b/packs/protection/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-21:00:12.513087 7fef577fe6c0 Recovering log #64 -2023/11/28-21:00:12.525182 7fef577fe6c0 Delete type=3 #62 -2023/11/28-21:00:12.525274 7fef577fe6c0 Delete type=0 #64 -2023/11/28-21:10:41.067506 7fef56ffd6c0 Level-0 table #70: started -2023/11/28-21:10:41.067577 7fef56ffd6c0 Level-0 table #70: 0 bytes OK -2023/11/28-21:10:41.109348 7fef56ffd6c0 Delete type=0 #68 -2023/11/28-21:10:41.195934 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/11/28-21:10:41.196029 7fef56ffd6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/11/28-22:14:53.978702 7fef57fff6c0 Recovering log #81 +2023/11/28-22:14:53.988721 7fef57fff6c0 Delete type=3 #79 +2023/11/28-22:14:53.988779 7fef57fff6c0 Delete type=0 #81 +2023/11/28-22:25:36.187160 7fef56ffd6c0 Level-0 table #86: started +2023/11/28-22:25:36.187189 7fef56ffd6c0 Level-0 table #86: 0 bytes OK +2023/11/28-22:25:36.193995 7fef56ffd6c0 Delete type=0 #84 +2023/11/28-22:25:36.200924 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/11/28-22:25:36.200951 7fef56ffd6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) diff --git a/packs/protection/MANIFEST-000071 b/packs/protection/MANIFEST-000071 deleted file mode 100644 index f0209f8672f0a271e7429471aae77ecf3308b695..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmaD^XwKElz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&P8Nub5eqnp><`mYN@I z=3Y{jW#&?7U|}A{$in~z>`YGI*kOu{GF%K@0>e_BJp(->+(OM6IUtH)^0*AqO}W9x a!NADm!O6hv$- Rh98gCGk~}}KrSB(0|43Z5zznu diff --git a/packs/skills/000073.log b/packs/skills/000073.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index be93edb..d05b681 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000071 +MANIFEST-000087 diff --git a/packs/skills/LOG b/packs/skills/LOG index 89233a9..45bb1b4 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2023/11/28-21:10:45.695496 7fef577fe6c0 Recovering log #69 -2023/11/28-21:10:45.755106 7fef577fe6c0 Delete type=3 #67 -2023/11/28-21:10:45.755198 7fef577fe6c0 Delete type=0 #69 -2023/11/28-21:42:12.852210 7fef56ffd6c0 Level-0 table #74: started -2023/11/28-21:42:12.852268 7fef56ffd6c0 Level-0 table #74: 0 bytes OK -2023/11/28-21:42:12.858430 7fef56ffd6c0 Delete type=0 #72 -2023/11/28-21:42:12.858569 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/11/28-21:42:12.869087 7fef56ffd6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/11/28-22:25:39.755108 7fef577fe6c0 Recovering log #85 +2023/11/28-22:25:39.764999 7fef577fe6c0 Delete type=3 #83 +2023/11/28-22:25:39.765054 7fef577fe6c0 Delete type=0 #85 +2023/11/28-22:26:01.737555 7fef56ffd6c0 Level-0 table #90: started +2023/11/28-22:26:01.737598 7fef56ffd6c0 Level-0 table #90: 0 bytes OK +2023/11/28-22:26:01.779655 7fef56ffd6c0 Delete type=0 #88 +2023/11/28-22:26:01.780041 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/11/28-22:26:01.835335 7fef56ffd6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old index 55aa0db..62e023e 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-21:00:12.439812 7fef57fff6c0 Recovering log #65 -2023/11/28-21:00:12.450501 7fef57fff6c0 Delete type=3 #63 -2023/11/28-21:00:12.450602 7fef57fff6c0 Delete type=0 #65 -2023/11/28-21:10:40.752930 7fef56ffd6c0 Level-0 table #70: started -2023/11/28-21:10:40.752995 7fef56ffd6c0 Level-0 table #70: 0 bytes OK -2023/11/28-21:10:40.793770 7fef56ffd6c0 Delete type=0 #68 -2023/11/28-21:10:40.857320 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/11/28-21:10:40.857386 7fef56ffd6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/11/28-22:14:53.914347 7ff1ed3ff6c0 Recovering log #81 +2023/11/28-22:14:53.924342 7ff1ed3ff6c0 Delete type=3 #79 +2023/11/28-22:14:53.924395 7ff1ed3ff6c0 Delete type=0 #81 +2023/11/28-22:25:36.119696 7fef56ffd6c0 Level-0 table #86: started +2023/11/28-22:25:36.119755 7fef56ffd6c0 Level-0 table #86: 0 bytes OK +2023/11/28-22:25:36.127384 7fef56ffd6c0 Delete type=0 #84 +2023/11/28-22:25:36.137845 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/11/28-22:25:36.148441 7fef56ffd6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000071 b/packs/skills/MANIFEST-000071 deleted file mode 100644 index c655f6e17c21cff99baa97324a1614c94bc899fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmaF7@%_(c21Z7yoYb<^oRlOzr^=Gl^338?=ltA)#G=HK{32FHdBx0<)ZAjll0vgw z*Yt?|bn^_8u*&dkMmYvBU}rLVWdl=W;FDA3Qt4b;cza diff --git a/packs/tables/000072.log b/packs/tables/000072.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/tables/CURRENT b/packs/tables/CURRENT index bcf1079..a43fb19 100644 --- a/packs/tables/CURRENT +++ b/packs/tables/CURRENT @@ -1 +1 @@ -MANIFEST-000070 +MANIFEST-000086 diff --git a/packs/tables/LOG b/packs/tables/LOG index 554fd5d..eba75bc 100644 --- a/packs/tables/LOG +++ b/packs/tables/LOG @@ -1,8 +1,8 @@ -2023/11/28-21:10:46.114679 7ff1ecbfe6c0 Recovering log #68 -2023/11/28-21:10:46.181412 7ff1ecbfe6c0 Delete type=3 #66 -2023/11/28-21:10:46.181497 7ff1ecbfe6c0 Delete type=0 #68 -2023/11/28-21:42:12.904868 7fef56ffd6c0 Level-0 table #73: started -2023/11/28-21:42:12.904895 7fef56ffd6c0 Level-0 table #73: 0 bytes OK -2023/11/28-21:42:12.911019 7fef56ffd6c0 Delete type=0 #71 -2023/11/28-21:42:12.925227 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/11/28-21:42:12.925299 7fef56ffd6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/11/28-22:25:39.841825 7ff1ecbfe6c0 Recovering log #84 +2023/11/28-22:25:39.851624 7ff1ecbfe6c0 Delete type=3 #82 +2023/11/28-22:25:39.851681 7ff1ecbfe6c0 Delete type=0 #84 +2023/11/28-22:26:02.110352 7fef56ffd6c0 Level-0 table #89: started +2023/11/28-22:26:02.110380 7fef56ffd6c0 Level-0 table #89: 0 bytes OK +2023/11/28-22:26:02.153538 7fef56ffd6c0 Delete type=0 #87 +2023/11/28-22:26:02.153745 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/11/28-22:26:02.153771 7fef56ffd6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) diff --git a/packs/tables/LOG.old b/packs/tables/LOG.old index d2daa5f..b75b345 100644 --- a/packs/tables/LOG.old +++ b/packs/tables/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-21:00:12.542948 7ff1ecbfe6c0 Recovering log #64 -2023/11/28-21:00:12.554265 7ff1ecbfe6c0 Delete type=3 #62 -2023/11/28-21:00:12.554422 7ff1ecbfe6c0 Delete type=0 #64 -2023/11/28-21:10:41.109588 7fef56ffd6c0 Level-0 table #69: started -2023/11/28-21:10:41.109652 7fef56ffd6c0 Level-0 table #69: 0 bytes OK -2023/11/28-21:10:41.153510 7fef56ffd6c0 Delete type=0 #67 -2023/11/28-21:10:41.195963 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/11/28-21:10:41.196054 7fef56ffd6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/11/28-22:14:54.003336 7ff1ecbfe6c0 Recovering log #80 +2023/11/28-22:14:54.014281 7ff1ecbfe6c0 Delete type=3 #78 +2023/11/28-22:14:54.014518 7ff1ecbfe6c0 Delete type=0 #80 +2023/11/28-22:25:36.174449 7fef56ffd6c0 Level-0 table #85: started +2023/11/28-22:25:36.174476 7fef56ffd6c0 Level-0 table #85: 0 bytes OK +2023/11/28-22:25:36.180710 7fef56ffd6c0 Delete type=0 #83 +2023/11/28-22:25:36.200896 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/11/28-22:25:36.200943 7fef56ffd6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) diff --git a/packs/tables/MANIFEST-000070 b/packs/tables/MANIFEST-000070 deleted file mode 100644 index 21ee7fb0ccf897ebb73c64859415e50dd36b62e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmcarnsKj&fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ^^AmqVo73BPHM4Y zRhUt}SEYqll&e8rUV2a@qbLIySV9%(6{QxJ=9FM6)GH71jW7&Js>sRm$o25dEnpOZ h=sZwlv5td*k;$Etf!Tvav~K0RYap%%kn6=F3IKlEF5UnD diff --git a/system.json b/system.json index 6e04a6a..3174c75 100644 --- a/system.json +++ b/system.json @@ -1,7 +1,7 @@ { "id": "fvtt-wasteland", "description": "Wasteland RPG for FoundryVTT", - "version": "11.0.6", + "version": "11.0.7", "authors": [ { "name": "Uberwald/LeRatierBretonnien", @@ -23,7 +23,7 @@ "gridUnits": "m", "license": "LICENSE.txt", "manifest": "https://www.uberwald.me/gitea/public/fvtt-wasteland/raw/branch/main/system.json", - "download": "https://www.uberwald.me/gitea/public/fvtt-wasteland/archive/fvtt-wasteland-v11.0.6.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-wasteland/archive/fvtt-wasteland-v11.0.7.zip", "packs": [ { "type": "Item", diff --git a/template.json b/template.json index 232748f..96b4102 100644 --- a/template.json +++ b/template.json @@ -135,6 +135,20 @@ "base" ] }, + "charme": { + "charmetype": "tour", + "resultats": [ + {"value":-1, "description": ""}, + {"value":-1, "description": ""}, + {"value":-1, "description": ""}, + {"value":-1, "description": ""}, + {"value":-1, "description": ""}, + {"value":-1, "description": ""} + ], + "templates": [ + "base" + ] + }, "artifex": { "artifextype": "vapeur", "complexite": 0, @@ -235,17 +249,6 @@ "base" ] }, - "pacte": { - "allegeance": "", - "templates": [ - "base" - ] - }, - "traitchaotique": { - "templates": [ - "base" - ] - }, "monnaie": { "quantite": 0, "unite": "", diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index ef90e5a..2f6c5c7 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -239,6 +239,62 @@ +
+
    +
  • + +

    +     + + + +
     
    +
    +
    +
    • + {{#each charmes as |charme key|}} +
  • + + {{charme.name}} + {{charme.system.allegeance}} +
     
    +
    + + +
    +
    • + {{/each}} +
+
+ +
+
    +
  • + +

    +     + + + +
     
    +
    +
    +
    • + {{#each tours as |tour key|}} +
  • + + {{tour.name}} + {{tour.system.allegeance}} +
     
    +
    + + +
    +
    • + {{/each}} +
+
+
  • diff --git a/templates/item-pouvoir-sheet.html b/templates/item-pouvoir-sheet.html index fd2caf4..448586b 100644 --- a/templates/item-pouvoir-sheet.html +++ b/templates/item-pouvoir-sheet.html @@ -1,6 +1,6 @@
    - + Portrait