diff --git a/assets/icons/don.webp b/assets/icons/don.webp new file mode 100644 index 0000000..a55cc6d Binary files /dev/null and b/assets/icons/don.webp differ diff --git a/assets/icons/hubris.webp b/assets/icons/hubris.webp new file mode 100644 index 0000000..8538750 Binary files /dev/null and b/assets/icons/hubris.webp differ diff --git a/modules/wasteland-actor-sheet.js b/modules/wasteland-actor-sheet.js index 15dcd45..3de505c 100644 --- a/modules/wasteland-actor-sheet.js +++ b/modules/wasteland-actor-sheet.js @@ -43,9 +43,12 @@ export class WastelandActorSheet extends ActorSheet { armes: duplicate(this.actor.getWeapons()), protections: duplicate(this.actor.getArmors()), pouvoirs:duplicate(this.actor.getPouvoirs()), + dons: duplicate(this.actor.getDons()), + hubrises: duplicate(this.actor.getHubris()), tours:duplicate(this.actor.getTours()), artifex: duplicate(this.actor.getArtifex()), charmes:duplicate(this.actor.getCharmes()), + peuple: duplicate(this.actor.getPeuple() || {}), 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 6fb7e3b..2f32994 100644 --- a/modules/wasteland-actor.js +++ b/modules/wasteland-actor.js @@ -122,6 +122,12 @@ export class WastelandActor extends Actor { getPouvoirs() { return this.getItemSorted(["pouvoir"]) } + getDons() { + return this.getItemSorted(["don"]) + } + getHubris() { + return this.getItemSorted(["hubris"]) + } getEquipments() { return this.getItemSorted(["equipement"]) } @@ -131,6 +137,9 @@ export class WastelandActor extends Actor { getArmors() { return this.getItemSorted(["protection"]) } + getPeuple() { + return this.items.find(item => item.type == "peuple") + } getOrigine() { return this.items.find(item => item.type == "origine") } @@ -206,7 +215,7 @@ export class WastelandActor extends Actor { if (this.system.sante.base != newSante) { this.update({ 'system.sante.base': newSante }) } - let newPsyche = (this.system.attributs.cla.value + this.system.attributs.tre.value) * this.system.biodata.psychemultiplier + 5 + let newPsyche = ((this.system.attributs.cla.value + this.system.attributs.tre.value) * 2) + 5 if (this.system.psyche.fullmax != newPsyche) { this.update({ 'system.psyche.fullmax': newPsyche }) } diff --git a/modules/wasteland-config.js b/modules/wasteland-config.js index 5427c28..8f4e588 100644 --- a/modules/wasteland-config.js +++ b/modules/wasteland-config.js @@ -14,6 +14,10 @@ export const WASTELAND_CONFIG = { "nuit": "Chemin des Nuits", "oiseaux": "Chemin des Oiseaux" }, + hubrisType: { + "mental": "Mental", + "physique": "Physique", + }, charmetype: { tour: "Tour", charme: "Charme", diff --git a/modules/wasteland-item.js b/modules/wasteland-item.js index d6afc85..fec1a30 100644 --- a/modules/wasteland-item.js +++ b/modules/wasteland-item.js @@ -17,6 +17,8 @@ export const defaultItemImg = { heritage: "systems/fvtt-wasteland/assets/icons/legacy.webp", charme: "systems/fvtt-wasteland/assets/icons/charm.webp", peuple: "systems/fvtt-wasteland/assets/icons/people.webp", + don: "systems/fvtt-wasteland/assets/icons/don.webp", + hubris: "systems/fvtt-wasteland/assets/icons/hubris.webp", } /** diff --git a/packs/armes/000080.log b/packs/armes/000088.log similarity index 100% rename from packs/armes/000080.log rename to packs/armes/000088.log diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT index 741d918..a43fb19 100644 --- a/packs/armes/CURRENT +++ b/packs/armes/CURRENT @@ -1 +1 @@ -MANIFEST-000078 +MANIFEST-000086 diff --git a/packs/armes/LOG b/packs/armes/LOG index 020c785..95fe166 100644 --- a/packs/armes/LOG +++ b/packs/armes/LOG @@ -1,8 +1,8 @@ -2023/12/01-09:39:06.657234 7fef57fff6c0 Recovering log #76 -2023/12/01-09:39:06.667932 7fef57fff6c0 Delete type=3 #74 -2023/12/01-09:39:06.667995 7fef57fff6c0 Delete type=0 #76 -2023/12/01-09:50:10.707951 7fef56ffd6c0 Level-0 table #81: started -2023/12/01-09:50:10.707996 7fef56ffd6c0 Level-0 table #81: 0 bytes OK -2023/12/01-09:50:10.726578 7fef56ffd6c0 Delete type=0 #79 -2023/12/01-09:50:10.754430 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/12/01-09:50:10.754484 7fef56ffd6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/01-14:01:31.663762 7facd3fff6c0 Recovering log #84 +2023/12/01-14:01:31.673391 7facd3fff6c0 Delete type=3 #82 +2023/12/01-14:01:31.673441 7facd3fff6c0 Delete type=0 #84 +2023/12/01-14:02:58.886581 7faa52bff6c0 Level-0 table #89: started +2023/12/01-14:02:58.886605 7faa52bff6c0 Level-0 table #89: 0 bytes OK +2023/12/01-14:02:58.893826 7faa52bff6c0 Delete type=0 #87 +2023/12/01-14:02:58.906642 7faa52bff6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/01-14:02:58.906714 7faa52bff6c0 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 7b804c7..8c966a6 100644 --- a/packs/armes/LOG.old +++ b/packs/armes/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-09:36:46.735204 7fef57fff6c0 Recovering log #72 -2023/12/01-09:36:46.745007 7fef57fff6c0 Delete type=3 #70 -2023/12/01-09:36:46.745100 7fef57fff6c0 Delete type=0 #72 -2023/12/01-09:37:12.141437 7fef56ffd6c0 Level-0 table #77: started -2023/12/01-09:37:12.141461 7fef56ffd6c0 Level-0 table #77: 0 bytes OK -2023/12/01-09:37:12.148157 7fef56ffd6c0 Delete type=0 #75 -2023/12/01-09:37:12.155670 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/12/01-09:37:12.155729 7fef56ffd6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/01-13:53:39.494309 7facd3fff6c0 Recovering log #80 +2023/12/01-13:53:39.504896 7facd3fff6c0 Delete type=3 #78 +2023/12/01-13:53:39.504998 7facd3fff6c0 Delete type=0 #80 +2023/12/01-13:59:53.167281 7faa52bff6c0 Level-0 table #85: started +2023/12/01-13:59:53.167307 7faa52bff6c0 Level-0 table #85: 0 bytes OK +2023/12/01-13:59:53.198187 7faa52bff6c0 Delete type=0 #83 +2023/12/01-13:59:53.317461 7faa52bff6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/01-13:59:53.317523 7faa52bff6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) diff --git a/packs/armes/MANIFEST-000078 b/packs/armes/MANIFEST-000078 deleted file mode 100644 index 5d4e4eb..0000000 Binary files a/packs/armes/MANIFEST-000078 and /dev/null differ diff --git a/packs/armes/MANIFEST-000086 b/packs/armes/MANIFEST-000086 new file mode 100644 index 0000000..0897d66 Binary files /dev/null and b/packs/armes/MANIFEST-000086 differ diff --git a/packs/equipement/000034.log b/packs/equipement/000042.log similarity index 100% rename from packs/equipement/000034.log rename to packs/equipement/000042.log diff --git a/packs/equipement/CURRENT b/packs/equipement/CURRENT index 259cf53..e2c0c4b 100644 --- a/packs/equipement/CURRENT +++ b/packs/equipement/CURRENT @@ -1 +1 @@ -MANIFEST-000032 +MANIFEST-000040 diff --git a/packs/equipement/LOG b/packs/equipement/LOG index 0376e33..6ce714d 100644 --- a/packs/equipement/LOG +++ b/packs/equipement/LOG @@ -1,8 +1,8 @@ -2023/12/01-09:39:06.681576 7fef577fe6c0 Recovering log #30 -2023/12/01-09:39:06.693076 7fef577fe6c0 Delete type=3 #28 -2023/12/01-09:39:06.693136 7fef577fe6c0 Delete type=0 #30 -2023/12/01-09:50:10.747791 7fef56ffd6c0 Level-0 table #35: started -2023/12/01-09:50:10.747836 7fef56ffd6c0 Level-0 table #35: 0 bytes OK -2023/12/01-09:50:10.754312 7fef56ffd6c0 Delete type=0 #33 -2023/12/01-09:50:10.754473 7fef56ffd6c0 Manual compaction at level-0 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) -2023/12/01-09:50:10.754513 7fef56ffd6c0 Manual compaction at level-1 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) +2023/12/01-14:01:31.687335 7face89f96c0 Recovering log #38 +2023/12/01-14:01:31.697567 7face89f96c0 Delete type=3 #36 +2023/12/01-14:01:31.697683 7face89f96c0 Delete type=0 #38 +2023/12/01-14:02:58.893938 7faa52bff6c0 Level-0 table #43: started +2023/12/01-14:02:58.893962 7faa52bff6c0 Level-0 table #43: 0 bytes OK +2023/12/01-14:02:58.900266 7faa52bff6c0 Delete type=0 #41 +2023/12/01-14:02:58.906658 7faa52bff6c0 Manual compaction at level-0 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) +2023/12/01-14:02:58.906700 7faa52bff6c0 Manual compaction at level-1 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/LOG.old b/packs/equipement/LOG.old index f63ec97..30b8f81 100644 --- a/packs/equipement/LOG.old +++ b/packs/equipement/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-09:36:46.762028 7ff1ecbfe6c0 Recovering log #25 -2023/12/01-09:36:46.771832 7ff1ecbfe6c0 Delete type=3 #23 -2023/12/01-09:36:46.771891 7ff1ecbfe6c0 Delete type=0 #25 -2023/12/01-09:37:12.127448 7fef56ffd6c0 Level-0 table #31: started -2023/12/01-09:37:12.127484 7fef56ffd6c0 Level-0 table #31: 0 bytes OK -2023/12/01-09:37:12.133959 7fef56ffd6c0 Delete type=0 #29 -2023/12/01-09:37:12.155632 7fef56ffd6c0 Manual compaction at level-0 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) -2023/12/01-09:37:12.155701 7fef56ffd6c0 Manual compaction at level-1 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) +2023/12/01-13:53:39.520862 7facd37fe6c0 Recovering log #34 +2023/12/01-13:53:39.531517 7facd37fe6c0 Delete type=3 #32 +2023/12/01-13:53:39.531569 7facd37fe6c0 Delete type=0 #34 +2023/12/01-13:59:53.280355 7faa52bff6c0 Level-0 table #39: started +2023/12/01-13:59:53.280393 7faa52bff6c0 Level-0 table #39: 0 bytes OK +2023/12/01-13:59:53.317311 7faa52bff6c0 Delete type=0 #37 +2023/12/01-13:59:53.317504 7faa52bff6c0 Manual compaction at level-0 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) +2023/12/01-13:59:53.317532 7faa52bff6c0 Manual compaction at level-1 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/MANIFEST-000032 b/packs/equipement/MANIFEST-000040 similarity index 74% rename from packs/equipement/MANIFEST-000032 rename to packs/equipement/MANIFEST-000040 index 64978f8..4a1ff52 100644 Binary files a/packs/equipement/MANIFEST-000032 and b/packs/equipement/MANIFEST-000040 differ diff --git a/packs/heritages/000104.log b/packs/heritages/000112.log similarity index 100% rename from packs/heritages/000104.log rename to packs/heritages/000112.log diff --git a/packs/heritages/CURRENT b/packs/heritages/CURRENT index e333c89..a451d53 100644 --- a/packs/heritages/CURRENT +++ b/packs/heritages/CURRENT @@ -1 +1 @@ -MANIFEST-000102 +MANIFEST-000110 diff --git a/packs/heritages/LOG b/packs/heritages/LOG index c5f39fb..7a355b2 100644 --- a/packs/heritages/LOG +++ b/packs/heritages/LOG @@ -1,8 +1,8 @@ -2023/12/01-09:39:06.620746 7ff1ecbfe6c0 Recovering log #100 -2023/12/01-09:39:06.631263 7ff1ecbfe6c0 Delete type=3 #98 -2023/12/01-09:39:06.631327 7ff1ecbfe6c0 Delete type=0 #100 -2023/12/01-09:50:10.694250 7fef56ffd6c0 Level-0 table #105: started -2023/12/01-09:50:10.694272 7fef56ffd6c0 Level-0 table #105: 0 bytes OK -2023/12/01-09:50:10.700492 7fef56ffd6c0 Delete type=0 #103 -2023/12/01-09:50:10.707781 7fef56ffd6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) -2023/12/01-09:50:10.707812 7fef56ffd6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/12/01-14:01:31.626736 7face91fa6c0 Recovering log #108 +2023/12/01-14:01:31.637348 7face91fa6c0 Delete type=3 #106 +2023/12/01-14:01:31.637457 7face91fa6c0 Delete type=0 #108 +2023/12/01-14:02:58.867219 7faa52bff6c0 Level-0 table #113: started +2023/12/01-14:02:58.867259 7faa52bff6c0 Level-0 table #113: 0 bytes OK +2023/12/01-14:02:58.873501 7faa52bff6c0 Delete type=0 #111 +2023/12/01-14:02:58.880237 7faa52bff6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/12/01-14:02:58.880272 7faa52bff6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) diff --git a/packs/heritages/LOG.old b/packs/heritages/LOG.old index e093b54..61ba0b8 100644 --- a/packs/heritages/LOG.old +++ b/packs/heritages/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-09:36:46.695660 7fef577fe6c0 Recovering log #96 -2023/12/01-09:36:46.705301 7fef577fe6c0 Delete type=3 #94 -2023/12/01-09:36:46.705365 7fef577fe6c0 Delete type=0 #96 -2023/12/01-09:37:12.112938 7fef56ffd6c0 Level-0 table #101: started -2023/12/01-09:37:12.112983 7fef56ffd6c0 Level-0 table #101: 0 bytes OK -2023/12/01-09:37:12.120632 7fef56ffd6c0 Delete type=0 #99 -2023/12/01-09:37:12.127253 7fef56ffd6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) -2023/12/01-09:37:12.127284 7fef56ffd6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/12/01-13:53:39.455304 7face89f96c0 Recovering log #104 +2023/12/01-13:53:39.465228 7face89f96c0 Delete type=3 #102 +2023/12/01-13:53:39.465278 7face89f96c0 Delete type=0 #104 +2023/12/01-13:59:52.988050 7faa52bff6c0 Level-0 table #109: started +2023/12/01-13:59:52.988087 7faa52bff6c0 Level-0 table #109: 0 bytes OK +2023/12/01-13:59:53.032097 7faa52bff6c0 Delete type=0 #107 +2023/12/01-13:59:53.105940 7faa52bff6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/12/01-13:59:53.167051 7faa52bff6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) diff --git a/packs/heritages/MANIFEST-000102 b/packs/heritages/MANIFEST-000110 similarity index 73% rename from packs/heritages/MANIFEST-000102 rename to packs/heritages/MANIFEST-000110 index ee4e7bf..3862989 100644 Binary files a/packs/heritages/MANIFEST-000102 and b/packs/heritages/MANIFEST-000110 differ diff --git a/packs/metiers/000104.log b/packs/metiers/000112.log similarity index 100% rename from packs/metiers/000104.log rename to packs/metiers/000112.log diff --git a/packs/metiers/CURRENT b/packs/metiers/CURRENT index e333c89..a451d53 100644 --- a/packs/metiers/CURRENT +++ b/packs/metiers/CURRENT @@ -1 +1 @@ -MANIFEST-000102 +MANIFEST-000110 diff --git a/packs/metiers/LOG b/packs/metiers/LOG index 0565725..9372822 100644 --- a/packs/metiers/LOG +++ b/packs/metiers/LOG @@ -1,8 +1,8 @@ -2023/12/01-09:39:06.633401 7fef577fe6c0 Recovering log #100 -2023/12/01-09:39:06.643130 7fef577fe6c0 Delete type=3 #98 -2023/12/01-09:39:06.643178 7fef577fe6c0 Delete type=0 #100 -2023/12/01-09:50:10.700604 7fef56ffd6c0 Level-0 table #105: started -2023/12/01-09:50:10.700627 7fef56ffd6c0 Level-0 table #105: 0 bytes OK -2023/12/01-09:50:10.707633 7fef56ffd6c0 Delete type=0 #103 -2023/12/01-09:50:10.707791 7fef56ffd6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) -2023/12/01-09:50:10.707820 7fef56ffd6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/12/01-14:01:31.639020 7face89f96c0 Recovering log #108 +2023/12/01-14:01:31.648871 7face89f96c0 Delete type=3 #106 +2023/12/01-14:01:31.648946 7face89f96c0 Delete type=0 #108 +2023/12/01-14:02:58.873626 7faa52bff6c0 Level-0 table #113: started +2023/12/01-14:02:58.873648 7faa52bff6c0 Level-0 table #113: 0 bytes OK +2023/12/01-14:02:58.880148 7faa52bff6c0 Delete type=0 #111 +2023/12/01-14:02:58.880265 7faa52bff6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/12/01-14:02:58.880278 7faa52bff6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) diff --git a/packs/metiers/LOG.old b/packs/metiers/LOG.old index 15a1b1a..d5927a0 100644 --- a/packs/metiers/LOG.old +++ b/packs/metiers/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-09:36:46.708601 7ff1ecbfe6c0 Recovering log #96 -2023/12/01-09:36:46.718654 7ff1ecbfe6c0 Delete type=3 #94 -2023/12/01-09:36:46.718767 7ff1ecbfe6c0 Delete type=0 #96 -2023/12/01-09:37:12.099976 7fef56ffd6c0 Level-0 table #101: started -2023/12/01-09:37:12.100003 7fef56ffd6c0 Level-0 table #101: 0 bytes OK -2023/12/01-09:37:12.106417 7fef56ffd6c0 Delete type=0 #99 -2023/12/01-09:37:12.127232 7fef56ffd6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) -2023/12/01-09:37:12.127277 7fef56ffd6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/12/01-13:53:39.468222 7facd37fe6c0 Recovering log #104 +2023/12/01-13:53:39.478045 7facd37fe6c0 Delete type=3 #102 +2023/12/01-13:53:39.478100 7facd37fe6c0 Delete type=0 #104 +2023/12/01-13:59:53.074479 7faa52bff6c0 Level-0 table #109: started +2023/12/01-13:59:53.074531 7faa52bff6c0 Level-0 table #109: 0 bytes OK +2023/12/01-13:59:53.105798 7faa52bff6c0 Delete type=0 #107 +2023/12/01-13:59:53.105987 7faa52bff6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/12/01-13:59:53.167073 7faa52bff6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) diff --git a/packs/metiers/MANIFEST-000102 b/packs/metiers/MANIFEST-000110 similarity index 73% rename from packs/metiers/MANIFEST-000102 rename to packs/metiers/MANIFEST-000110 index 8ffbace..119051e 100644 Binary files a/packs/metiers/MANIFEST-000102 and b/packs/metiers/MANIFEST-000110 differ diff --git a/packs/origines/000105.log b/packs/origines/000113.log similarity index 100% rename from packs/origines/000105.log rename to packs/origines/000113.log diff --git a/packs/origines/CURRENT b/packs/origines/CURRENT index 1fb45e8..0e66324 100644 --- a/packs/origines/CURRENT +++ b/packs/origines/CURRENT @@ -1 +1 @@ -MANIFEST-000103 +MANIFEST-000111 diff --git a/packs/origines/LOG b/packs/origines/LOG index 921458d..133d941 100644 --- a/packs/origines/LOG +++ b/packs/origines/LOG @@ -1,8 +1,8 @@ -2023/12/01-09:39:06.608385 7fef57fff6c0 Recovering log #101 -2023/12/01-09:39:06.618559 7fef57fff6c0 Delete type=3 #99 -2023/12/01-09:39:06.618628 7fef57fff6c0 Delete type=0 #101 -2023/12/01-09:50:10.687428 7fef56ffd6c0 Level-0 table #106: started -2023/12/01-09:50:10.687455 7fef56ffd6c0 Level-0 table #106: 0 bytes OK -2023/12/01-09:50:10.694138 7fef56ffd6c0 Delete type=0 #104 -2023/12/01-09:50:10.707759 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) -2023/12/01-09:50:10.707828 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/12/01-14:01:31.614253 7facd3fff6c0 Recovering log #109 +2023/12/01-14:01:31.623933 7facd3fff6c0 Delete type=3 #107 +2023/12/01-14:01:31.624011 7facd3fff6c0 Delete type=0 #109 +2023/12/01-14:02:58.860374 7faa52bff6c0 Level-0 table #114: started +2023/12/01-14:02:58.860398 7faa52bff6c0 Level-0 table #114: 0 bytes OK +2023/12/01-14:02:58.867039 7faa52bff6c0 Delete type=0 #112 +2023/12/01-14:02:58.873616 7faa52bff6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/12/01-14:02:58.880257 7faa52bff6c0 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 a79ec7c..3db0a0f 100644 --- a/packs/origines/LOG.old +++ b/packs/origines/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-09:36:46.681142 7fef57fff6c0 Recovering log #97 -2023/12/01-09:36:46.692047 7fef57fff6c0 Delete type=3 #95 -2023/12/01-09:36:46.692102 7fef57fff6c0 Delete type=0 #97 -2023/12/01-09:37:12.120793 7fef56ffd6c0 Level-0 table #102: started -2023/12/01-09:37:12.120840 7fef56ffd6c0 Level-0 table #102: 0 bytes OK -2023/12/01-09:37:12.127110 7fef56ffd6c0 Delete type=0 #100 -2023/12/01-09:37:12.127263 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) -2023/12/01-09:37:12.127292 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/12/01-13:53:39.441816 7facd3fff6c0 Recovering log #105 +2023/12/01-13:53:39.451617 7facd3fff6c0 Delete type=3 #103 +2023/12/01-13:53:39.451709 7facd3fff6c0 Delete type=0 #105 +2023/12/01-13:59:53.032302 7faa52bff6c0 Level-0 table #110: started +2023/12/01-13:59:53.032354 7faa52bff6c0 Level-0 table #110: 0 bytes OK +2023/12/01-13:59:53.074270 7faa52bff6c0 Delete type=0 #108 +2023/12/01-13:59:53.105970 7faa52bff6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/12/01-13:59:53.167064 7faa52bff6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) diff --git a/packs/origines/MANIFEST-000103 b/packs/origines/MANIFEST-000111 similarity index 80% rename from packs/origines/MANIFEST-000103 rename to packs/origines/MANIFEST-000111 index 78b1119..78ac515 100644 Binary files a/packs/origines/MANIFEST-000103 and b/packs/origines/MANIFEST-000111 differ diff --git a/packs/pouvoirs/000005.ldb b/packs/pouvoirs/000005.ldb deleted file mode 100644 index fe9402d..0000000 Binary files a/packs/pouvoirs/000005.ldb and /dev/null differ diff --git a/packs/pouvoirs/000026.ldb b/packs/pouvoirs/000026.ldb new file mode 100644 index 0000000..01f8349 Binary files /dev/null and b/packs/pouvoirs/000026.ldb differ diff --git a/packs/pouvoirs/000020.log b/packs/pouvoirs/000029.log similarity index 100% rename from packs/pouvoirs/000020.log rename to packs/pouvoirs/000029.log diff --git a/packs/pouvoirs/CURRENT b/packs/pouvoirs/CURRENT index e417a51..3bf5164 100644 --- a/packs/pouvoirs/CURRENT +++ b/packs/pouvoirs/CURRENT @@ -1 +1 @@ -MANIFEST-000018 +MANIFEST-000027 diff --git a/packs/pouvoirs/LOG b/packs/pouvoirs/LOG index 0099256..259123b 100644 --- a/packs/pouvoirs/LOG +++ b/packs/pouvoirs/LOG @@ -1,8 +1,8 @@ -2023/12/01-09:39:06.595181 7ff1ed3ff6c0 Recovering log #16 -2023/12/01-09:39:06.605896 7ff1ed3ff6c0 Delete type=3 #14 -2023/12/01-09:39:06.605998 7ff1ed3ff6c0 Delete type=0 #16 -2023/12/01-09:50:10.680999 7fef56ffd6c0 Level-0 table #21: started -2023/12/01-09:50:10.681032 7fef56ffd6c0 Level-0 table #21: 0 bytes OK -2023/12/01-09:50:10.687287 7fef56ffd6c0 Delete type=0 #19 -2023/12/01-09:50:10.694237 7fef56ffd6c0 Manual compaction at level-0 from '!folders!Oohjh4Xz8l2TjgZX' @ 72057594037927935 : 1 .. '!items!zcFqloFjpZINp9Ku' @ 0 : 0; will stop at (end) -2023/12/01-09:50:10.707771 7fef56ffd6c0 Manual compaction at level-1 from '!folders!Oohjh4Xz8l2TjgZX' @ 72057594037927935 : 1 .. '!items!zcFqloFjpZINp9Ku' @ 0 : 0; will stop at (end) +2023/12/01-14:01:31.602177 7facd37fe6c0 Recovering log #24 +2023/12/01-14:01:31.611466 7facd37fe6c0 Delete type=3 #22 +2023/12/01-14:01:31.611526 7facd37fe6c0 Delete type=0 #24 +2023/12/01-14:02:58.854147 7faa52bff6c0 Level-0 table #30: started +2023/12/01-14:02:58.854179 7faa52bff6c0 Level-0 table #30: 0 bytes OK +2023/12/01-14:02:58.860296 7faa52bff6c0 Delete type=0 #28 +2023/12/01-14:02:58.873604 7faa52bff6c0 Manual compaction at level-0 from '!folders!9W8gPB3T9u9dGfXl' @ 72057594037927935 : 1 .. '!items!zew9hPVdne6w1FFv' @ 0 : 0; will stop at (end) +2023/12/01-14:02:58.880248 7faa52bff6c0 Manual compaction at level-1 from '!folders!9W8gPB3T9u9dGfXl' @ 72057594037927935 : 1 .. '!items!zew9hPVdne6w1FFv' @ 0 : 0; will stop at (end) diff --git a/packs/pouvoirs/LOG.old b/packs/pouvoirs/LOG.old index 826f29c..f299a6c 100644 --- a/packs/pouvoirs/LOG.old +++ b/packs/pouvoirs/LOG.old @@ -1,8 +1,15 @@ -2023/12/01-09:36:46.666596 7ff1ed3ff6c0 Recovering log #12 -2023/12/01-09:36:46.677154 7ff1ed3ff6c0 Delete type=3 #10 -2023/12/01-09:36:46.677264 7ff1ed3ff6c0 Delete type=0 #12 -2023/12/01-09:37:12.106537 7fef56ffd6c0 Level-0 table #17: started -2023/12/01-09:37:12.106566 7fef56ffd6c0 Level-0 table #17: 0 bytes OK -2023/12/01-09:37:12.112749 7fef56ffd6c0 Delete type=0 #15 -2023/12/01-09:37:12.127244 7fef56ffd6c0 Manual compaction at level-0 from '!folders!Oohjh4Xz8l2TjgZX' @ 72057594037927935 : 1 .. '!items!zcFqloFjpZINp9Ku' @ 0 : 0; will stop at (end) -2023/12/01-09:37:12.127270 7fef56ffd6c0 Manual compaction at level-1 from '!folders!Oohjh4Xz8l2TjgZX' @ 72057594037927935 : 1 .. '!items!zcFqloFjpZINp9Ku' @ 0 : 0; will stop at (end) +2023/12/01-13:53:39.428530 7face91fa6c0 Recovering log #20 +2023/12/01-13:53:39.438733 7face91fa6c0 Delete type=3 #18 +2023/12/01-13:53:39.438827 7face91fa6c0 Delete type=0 #20 +2023/12/01-13:59:52.933303 7faa52bff6c0 Level-0 table #25: started +2023/12/01-13:59:52.950915 7faa52bff6c0 Level-0 table #25: 80038 bytes OK +2023/12/01-13:59:52.987594 7faa52bff6c0 Delete type=0 #23 +2023/12/01-13:59:53.105920 7faa52bff6c0 Manual compaction at level-0 from '!folders!9W8gPB3T9u9dGfXl' @ 72057594037927935 : 1 .. '!items!zew9hPVdne6w1FFv' @ 0 : 0; will stop at (end) +2023/12/01-13:59:53.106005 7faa52bff6c0 Manual compaction at level-1 from '!folders!9W8gPB3T9u9dGfXl' @ 72057594037927935 : 1 .. '!items!zew9hPVdne6w1FFv' @ 0 : 0; will stop at '!items!zew9hPVdne6w1FFv' @ 128 : 1 +2023/12/01-13:59:53.106015 7faa52bff6c0 Compacting 1@1 + 1@2 files +2023/12/01-13:59:53.125156 7faa52bff6c0 Generated table #26@1: 109 keys, 80038 bytes +2023/12/01-13:59:53.125182 7faa52bff6c0 Compacted 1@1 + 1@2 files => 80038 bytes +2023/12/01-13:59:53.166759 7faa52bff6c0 compacted to: files[ 0 0 1 0 0 0 0 ] +2023/12/01-13:59:53.166870 7faa52bff6c0 Delete type=2 #5 +2023/12/01-13:59:53.166982 7faa52bff6c0 Delete type=2 #25 +2023/12/01-13:59:53.167081 7faa52bff6c0 Manual compaction at level-1 from '!items!zew9hPVdne6w1FFv' @ 128 : 1 .. '!items!zew9hPVdne6w1FFv' @ 0 : 0; will stop at (end) diff --git a/packs/pouvoirs/MANIFEST-000018 b/packs/pouvoirs/MANIFEST-000018 deleted file mode 100644 index c72006c..0000000 Binary files a/packs/pouvoirs/MANIFEST-000018 and /dev/null differ diff --git a/packs/pouvoirs/MANIFEST-000027 b/packs/pouvoirs/MANIFEST-000027 new file mode 100644 index 0000000..e6c8665 Binary files /dev/null and b/packs/pouvoirs/MANIFEST-000027 differ diff --git a/packs/protection/000141.log b/packs/protection/000149.log similarity index 100% rename from packs/protection/000141.log rename to packs/protection/000149.log diff --git a/packs/protection/CURRENT b/packs/protection/CURRENT index a52a9a4..1021bdc 100644 --- a/packs/protection/CURRENT +++ b/packs/protection/CURRENT @@ -1 +1 @@ -MANIFEST-000139 +MANIFEST-000147 diff --git a/packs/protection/LOG b/packs/protection/LOG index 532155a..1f8fadf 100644 --- a/packs/protection/LOG +++ b/packs/protection/LOG @@ -1,8 +1,8 @@ -2023/12/01-09:39:06.669675 7ff1ecbfe6c0 Recovering log #137 -2023/12/01-09:39:06.679611 7ff1ecbfe6c0 Delete type=3 #135 -2023/12/01-09:39:06.679673 7ff1ecbfe6c0 Delete type=0 #137 -2023/12/01-09:50:10.739689 7fef56ffd6c0 Level-0 table #142: started -2023/12/01-09:50:10.739715 7fef56ffd6c0 Level-0 table #142: 0 bytes OK -2023/12/01-09:50:10.747595 7fef56ffd6c0 Delete type=0 #140 -2023/12/01-09:50:10.754455 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/12/01-09:50:10.754505 7fef56ffd6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/01-14:01:31.675150 7face91fa6c0 Recovering log #145 +2023/12/01-14:01:31.685370 7face91fa6c0 Delete type=3 #143 +2023/12/01-14:01:31.685464 7face91fa6c0 Delete type=0 #145 +2023/12/01-14:02:58.880376 7faa52bff6c0 Level-0 table #150: started +2023/12/01-14:02:58.880453 7faa52bff6c0 Level-0 table #150: 0 bytes OK +2023/12/01-14:02:58.886483 7faa52bff6c0 Delete type=0 #148 +2023/12/01-14:02:58.906621 7faa52bff6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/01-14:02:58.906687 7faa52bff6c0 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 3a827de..7352e8f 100644 --- a/packs/protection/LOG.old +++ b/packs/protection/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-09:36:46.748226 7fef577fe6c0 Recovering log #133 -2023/12/01-09:36:46.759856 7fef577fe6c0 Delete type=3 #131 -2023/12/01-09:36:46.759936 7fef577fe6c0 Delete type=0 #133 -2023/12/01-09:37:12.148496 7fef56ffd6c0 Level-0 table #138: started -2023/12/01-09:37:12.148537 7fef56ffd6c0 Level-0 table #138: 0 bytes OK -2023/12/01-09:37:12.155495 7fef56ffd6c0 Delete type=0 #136 -2023/12/01-09:37:12.155687 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/12/01-09:37:12.155743 7fef56ffd6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/01-13:53:39.508151 7face89f96c0 Recovering log #141 +2023/12/01-13:53:39.518413 7face89f96c0 Delete type=3 #139 +2023/12/01-13:53:39.518484 7face89f96c0 Delete type=0 #141 +2023/12/01-13:59:53.237155 7faa52bff6c0 Level-0 table #146: started +2023/12/01-13:59:53.237188 7faa52bff6c0 Level-0 table #146: 0 bytes OK +2023/12/01-13:59:53.280148 7faa52bff6c0 Delete type=0 #144 +2023/12/01-13:59:53.317487 7faa52bff6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/01-13:59:53.317541 7faa52bff6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) diff --git a/packs/protection/MANIFEST-000139 b/packs/protection/MANIFEST-000147 similarity index 76% rename from packs/protection/MANIFEST-000139 rename to packs/protection/MANIFEST-000147 index 6b707c3..c1e0578 100644 Binary files a/packs/protection/MANIFEST-000139 and b/packs/protection/MANIFEST-000147 differ diff --git a/packs/scenes/000080.log b/packs/scenes/000088.log similarity index 100% rename from packs/scenes/000080.log rename to packs/scenes/000088.log diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT index 741d918..a43fb19 100644 --- a/packs/scenes/CURRENT +++ b/packs/scenes/CURRENT @@ -1 +1 @@ -MANIFEST-000078 +MANIFEST-000086 diff --git a/packs/scenes/LOG b/packs/scenes/LOG index ec0d79f..bd0b577 100644 --- a/packs/scenes/LOG +++ b/packs/scenes/LOG @@ -1,7 +1,7 @@ -2023/12/01-09:39:06.708661 7fef57fff6c0 Recovering log #76 -2023/12/01-09:39:06.718744 7fef57fff6c0 Delete type=3 #74 -2023/12/01-09:39:06.718806 7fef57fff6c0 Delete type=0 #76 -2023/12/01-09:50:10.754659 7fef56ffd6c0 Level-0 table #81: started -2023/12/01-09:50:10.754692 7fef56ffd6c0 Level-0 table #81: 0 bytes OK -2023/12/01-09:50:10.762186 7fef56ffd6c0 Delete type=0 #79 -2023/12/01-09:50:10.768711 7fef56ffd6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/12/01-14:01:31.712005 7facd3fff6c0 Recovering log #84 +2023/12/01-14:01:31.722434 7facd3fff6c0 Delete type=3 #82 +2023/12/01-14:01:31.722487 7facd3fff6c0 Delete type=0 #84 +2023/12/01-14:02:58.906829 7faa52bff6c0 Level-0 table #89: started +2023/12/01-14:02:58.906889 7faa52bff6c0 Level-0 table #89: 0 bytes OK +2023/12/01-14:02:58.914249 7faa52bff6c0 Delete type=0 #87 +2023/12/01-14:02:58.920445 7faa52bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/LOG.old b/packs/scenes/LOG.old index d26ffe5..7865746 100644 --- a/packs/scenes/LOG.old +++ b/packs/scenes/LOG.old @@ -1,7 +1,7 @@ -2023/12/01-09:36:46.789134 7fef57fff6c0 Recovering log #72 -2023/12/01-09:36:46.800351 7fef57fff6c0 Delete type=3 #70 -2023/12/01-09:36:46.800407 7fef57fff6c0 Delete type=0 #72 -2023/12/01-09:37:12.155825 7fef56ffd6c0 Level-0 table #77: started -2023/12/01-09:37:12.155880 7fef56ffd6c0 Level-0 table #77: 0 bytes OK -2023/12/01-09:37:12.162421 7fef56ffd6c0 Delete type=0 #75 -2023/12/01-09:37:12.170790 7fef56ffd6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/12/01-13:53:39.595199 7facd3fff6c0 Recovering log #80 +2023/12/01-13:53:39.604901 7facd3fff6c0 Delete type=3 #78 +2023/12/01-13:53:39.604956 7facd3fff6c0 Delete type=0 #80 +2023/12/01-13:59:53.354986 7faa52bff6c0 Level-0 table #85: started +2023/12/01-13:59:53.355010 7faa52bff6c0 Level-0 table #85: 0 bytes OK +2023/12/01-13:59:53.424142 7faa52bff6c0 Delete type=0 #83 +2023/12/01-13:59:53.424248 7faa52bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/MANIFEST-000078 b/packs/scenes/MANIFEST-000078 deleted file mode 100644 index 31cc30e..0000000 Binary files a/packs/scenes/MANIFEST-000078 and /dev/null differ diff --git a/packs/scenes/MANIFEST-000086 b/packs/scenes/MANIFEST-000086 new file mode 100644 index 0000000..6ddee89 Binary files /dev/null and b/packs/scenes/MANIFEST-000086 differ diff --git a/packs/skills/000141.log b/packs/skills/000149.log similarity index 100% rename from packs/skills/000141.log rename to packs/skills/000149.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index a52a9a4..1021bdc 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000139 +MANIFEST-000147 diff --git a/packs/skills/LOG b/packs/skills/LOG index f0eb856..2d9bb4b 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2023/12/01-09:39:06.582395 7fef577fe6c0 Recovering log #137 -2023/12/01-09:39:06.593503 7fef577fe6c0 Delete type=3 #135 -2023/12/01-09:39:06.593561 7fef577fe6c0 Delete type=0 #137 -2023/12/01-09:50:10.664378 7fef56ffd6c0 Level-0 table #142: started -2023/12/01-09:50:10.664411 7fef56ffd6c0 Level-0 table #142: 0 bytes OK -2023/12/01-09:50:10.670652 7fef56ffd6c0 Delete type=0 #140 -2023/12/01-09:50:10.680970 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/12/01-09:50:10.687417 7fef56ffd6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/01-14:01:31.589948 7face89f96c0 Recovering log #145 +2023/12/01-14:01:31.600115 7face89f96c0 Delete type=3 #143 +2023/12/01-14:01:31.600196 7face89f96c0 Delete type=0 #145 +2023/12/01-14:02:58.831814 7faa52bff6c0 Level-0 table #150: started +2023/12/01-14:02:58.831844 7faa52bff6c0 Level-0 table #150: 0 bytes OK +2023/12/01-14:02:58.837662 7faa52bff6c0 Delete type=0 #148 +2023/12/01-14:02:58.843878 7faa52bff6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/01-14:02:58.843906 7faa52bff6c0 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 a82e3d4..3a0f3b7 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-09:36:46.654705 7ff1ecbfe6c0 Recovering log #133 -2023/12/01-09:36:46.664667 7ff1ecbfe6c0 Delete type=3 #131 -2023/12/01-09:36:46.664725 7ff1ecbfe6c0 Delete type=0 #133 -2023/12/01-09:37:12.072090 7fef56ffd6c0 Level-0 table #138: started -2023/12/01-09:37:12.072144 7fef56ffd6c0 Level-0 table #138: 0 bytes OK -2023/12/01-09:37:12.078382 7fef56ffd6c0 Delete type=0 #136 -2023/12/01-09:37:12.089730 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/12/01-09:37:12.099838 7fef56ffd6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/01-13:53:39.415677 7facd37fe6c0 Recovering log #141 +2023/12/01-13:53:39.425756 7facd37fe6c0 Delete type=3 #139 +2023/12/01-13:53:39.425846 7facd37fe6c0 Delete type=0 #141 +2023/12/01-13:59:52.777793 7faa52bff6c0 Level-0 table #146: started +2023/12/01-13:59:52.777856 7faa52bff6c0 Level-0 table #146: 0 bytes OK +2023/12/01-13:59:52.814639 7faa52bff6c0 Delete type=0 #144 +2023/12/01-13:59:52.933047 7faa52bff6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/01-13:59:52.933139 7faa52bff6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000139 b/packs/skills/MANIFEST-000147 similarity index 74% rename from packs/skills/MANIFEST-000139 rename to packs/skills/MANIFEST-000147 index 6db12b9..db18563 100644 Binary files a/packs/skills/MANIFEST-000139 and b/packs/skills/MANIFEST-000147 differ diff --git a/packs/tables/000140.log b/packs/tables/000148.log similarity index 100% rename from packs/tables/000140.log rename to packs/tables/000148.log diff --git a/packs/tables/CURRENT b/packs/tables/CURRENT index 448b6f3..ffd4a01 100644 --- a/packs/tables/CURRENT +++ b/packs/tables/CURRENT @@ -1 +1 @@ -MANIFEST-000138 +MANIFEST-000146 diff --git a/packs/tables/LOG b/packs/tables/LOG index f309088..ef37095 100644 --- a/packs/tables/LOG +++ b/packs/tables/LOG @@ -1,8 +1,8 @@ -2023/12/01-09:39:06.694995 7ff1ed3ff6c0 Recovering log #136 -2023/12/01-09:39:06.705993 7ff1ed3ff6c0 Delete type=3 #134 -2023/12/01-09:39:06.706093 7ff1ed3ff6c0 Delete type=0 #136 -2023/12/01-09:50:10.762325 7fef56ffd6c0 Level-0 table #141: started -2023/12/01-09:50:10.762352 7fef56ffd6c0 Level-0 table #141: 0 bytes OK -2023/12/01-09:50:10.768595 7fef56ffd6c0 Delete type=0 #139 -2023/12/01-09:50:10.768730 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/12/01-09:50:10.768757 7fef56ffd6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/01-14:01:31.699537 7facd37fe6c0 Recovering log #144 +2023/12/01-14:01:31.709639 7facd37fe6c0 Delete type=3 #142 +2023/12/01-14:01:31.709701 7facd37fe6c0 Delete type=0 #144 +2023/12/01-14:02:58.914354 7faa52bff6c0 Level-0 table #149: started +2023/12/01-14:02:58.914378 7faa52bff6c0 Level-0 table #149: 0 bytes OK +2023/12/01-14:02:58.920351 7faa52bff6c0 Delete type=0 #147 +2023/12/01-14:02:58.920455 7faa52bff6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/01-14:02:58.920470 7faa52bff6c0 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 a665cd7..73011d2 100644 --- a/packs/tables/LOG.old +++ b/packs/tables/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-09:36:46.775593 7ff1ed3ff6c0 Recovering log #132 -2023/12/01-09:36:46.786437 7ff1ed3ff6c0 Delete type=3 #130 -2023/12/01-09:36:46.786518 7ff1ed3ff6c0 Delete type=0 #132 -2023/12/01-09:37:12.162985 7fef56ffd6c0 Level-0 table #137: started -2023/12/01-09:37:12.163493 7fef56ffd6c0 Level-0 table #137: 0 bytes OK -2023/12/01-09:37:12.170628 7fef56ffd6c0 Delete type=0 #135 -2023/12/01-09:37:12.170813 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/12/01-09:37:12.170854 7fef56ffd6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/01-13:53:39.581116 7face91fa6c0 Recovering log #140 +2023/12/01-13:53:39.591862 7face91fa6c0 Delete type=3 #138 +2023/12/01-13:53:39.591949 7face91fa6c0 Delete type=0 #140 +2023/12/01-13:59:53.317612 7faa52bff6c0 Level-0 table #145: started +2023/12/01-13:59:53.317640 7faa52bff6c0 Level-0 table #145: 0 bytes OK +2023/12/01-13:59:53.354885 7faa52bff6c0 Delete type=0 #143 +2023/12/01-13:59:53.424238 7faa52bff6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/01-13:59:53.424262 7faa52bff6c0 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-000138 b/packs/tables/MANIFEST-000146 similarity index 77% rename from packs/tables/MANIFEST-000138 rename to packs/tables/MANIFEST-000146 index 0b9bba4..65a3b0f 100644 Binary files a/packs/tables/MANIFEST-000138 and b/packs/tables/MANIFEST-000146 differ diff --git a/packs/tourscharmes/000049.log b/packs/tourscharmes/000057.log similarity index 100% rename from packs/tourscharmes/000049.log rename to packs/tourscharmes/000057.log diff --git a/packs/tourscharmes/CURRENT b/packs/tourscharmes/CURRENT index 1afa5d4..8355b42 100644 --- a/packs/tourscharmes/CURRENT +++ b/packs/tourscharmes/CURRENT @@ -1 +1 @@ -MANIFEST-000047 +MANIFEST-000055 diff --git a/packs/tourscharmes/LOG b/packs/tourscharmes/LOG index b93b2c2..c0db1f0 100644 --- a/packs/tourscharmes/LOG +++ b/packs/tourscharmes/LOG @@ -1,8 +1,8 @@ -2023/12/01-09:39:06.644879 7ff1ed3ff6c0 Recovering log #45 -2023/12/01-09:39:06.655562 7ff1ed3ff6c0 Delete type=3 #43 -2023/12/01-09:39:06.655619 7ff1ed3ff6c0 Delete type=0 #45 -2023/12/01-09:50:10.726878 7fef56ffd6c0 Level-0 table #50: started -2023/12/01-09:50:10.726905 7fef56ffd6c0 Level-0 table #50: 0 bytes OK -2023/12/01-09:50:10.739569 7fef56ffd6c0 Delete type=0 #48 -2023/12/01-09:50:10.754444 7fef56ffd6c0 Manual compaction at level-0 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) -2023/12/01-09:50:10.754493 7fef56ffd6c0 Manual compaction at level-1 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) +2023/12/01-14:01:31.650984 7facd37fe6c0 Recovering log #53 +2023/12/01-14:01:31.661531 7facd37fe6c0 Delete type=3 #51 +2023/12/01-14:01:31.661635 7facd37fe6c0 Delete type=0 #53 +2023/12/01-14:02:58.900371 7faa52bff6c0 Level-0 table #58: started +2023/12/01-14:02:58.900395 7faa52bff6c0 Level-0 table #58: 0 bytes OK +2023/12/01-14:02:58.906443 7faa52bff6c0 Delete type=0 #56 +2023/12/01-14:02:58.906674 7faa52bff6c0 Manual compaction at level-0 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) +2023/12/01-14:02:58.906730 7faa52bff6c0 Manual compaction at level-1 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) diff --git a/packs/tourscharmes/LOG.old b/packs/tourscharmes/LOG.old index c2aa94d..597ad94 100644 --- a/packs/tourscharmes/LOG.old +++ b/packs/tourscharmes/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-09:36:46.722223 7ff1ed3ff6c0 Recovering log #41 -2023/12/01-09:36:46.732190 7ff1ed3ff6c0 Delete type=3 #39 -2023/12/01-09:36:46.732256 7ff1ed3ff6c0 Delete type=0 #41 -2023/12/01-09:37:12.134235 7fef56ffd6c0 Level-0 table #46: started -2023/12/01-09:37:12.134301 7fef56ffd6c0 Level-0 table #46: 0 bytes OK -2023/12/01-09:37:12.141345 7fef56ffd6c0 Delete type=0 #44 -2023/12/01-09:37:12.155653 7fef56ffd6c0 Manual compaction at level-0 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) -2023/12/01-09:37:12.155716 7fef56ffd6c0 Manual compaction at level-1 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) +2023/12/01-13:53:39.480910 7face91fa6c0 Recovering log #49 +2023/12/01-13:53:39.490942 7face91fa6c0 Delete type=3 #47 +2023/12/01-13:53:39.491036 7face91fa6c0 Delete type=0 #49 +2023/12/01-13:59:53.198430 7faa52bff6c0 Level-0 table #54: started +2023/12/01-13:59:53.198486 7faa52bff6c0 Level-0 table #54: 0 bytes OK +2023/12/01-13:59:53.237011 7faa52bff6c0 Delete type=0 #52 +2023/12/01-13:59:53.317476 7faa52bff6c0 Manual compaction at level-0 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) +2023/12/01-13:59:53.317515 7faa52bff6c0 Manual compaction at level-1 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) diff --git a/packs/tourscharmes/MANIFEST-000047 b/packs/tourscharmes/MANIFEST-000055 similarity index 75% rename from packs/tourscharmes/MANIFEST-000047 rename to packs/tourscharmes/MANIFEST-000055 index 38a7649..b5de8f8 100644 Binary files a/packs/tourscharmes/MANIFEST-000047 and b/packs/tourscharmes/MANIFEST-000055 differ diff --git a/system.json b/system.json index c200702..7e6c8f0 100644 --- a/system.json +++ b/system.json @@ -1,7 +1,7 @@ { "id": "fvtt-wasteland", "description": "Wasteland RPG for FoundryVTT", - "version": "11.0.13", + "version": "11.0.14", "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.13.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-wasteland/archive/fvtt-wasteland-v11.0.14.zip", "packs": [ { "type": "Item", diff --git a/template.json b/template.json index 4c0662b..479894a 100644 --- a/template.json +++ b/template.json @@ -122,141 +122,175 @@ "bouclier", "charme", "artifex", - "peuple" + "peuple", + "don", + "hubris" ], - "pouvoir": { - "chemin": "force", - "attribut": "cla", - "competence": "", - "seuil": 0, + "don": { "coutpsyche": 0, - "complexite": 0, - "cible": "", - "duree": "", "templates": [ "base" ] }, - "charme": { - "charmetype": "tour", - "resultats": [ - {"value":-1, "description": ""}, - {"value":-1, "description": ""}, - {"value":-1, "description": ""}, - {"value":-1, "description": ""}, - {"value":-1, "description": ""}, - {"value":-1, "description": ""} - ], + "hubris": { + "hubristype": "mental", "templates": [ "base" ] }, - "artifex": { - "artifextype": "vapeur", - "complexite": 0, - "dureerealisation": "", - "tempsmiseenroute": "", - "defautcourant": "", - "competence": "", - "templates": [ - "base" - ] - }, - "mutation": { - "templates": [ - "base" - ] - }, - "peuple": { - "templates": [ - "base" - ] - }, - "origine": { - "templates": [ - "base" - ] - }, - "heritage": { - "templates": [ - "base" - ] - }, - "metier": { - "templates": [ - "base" - ] - }, - "capacite": { - "templates": [ - "base" - ] - }, - "equipement": { - "rarete": 0, - "prix": 0, - "templates": [ - "base" - ] - }, - "arme": { - "typearme": "", - "isdefense": false, - "bonusmaniementoff": 0, - "bonusmaniementdef": 0, - "degats": "", - "nonletaux": false, - "deuxmains": false, - "courte": 0, - "moyenne": 0, - "longue": 0, - "tr": 0, - "rarete": 0, - "prix": 0, - "equipped": false, - "templates": [ - "base" - ] - }, - "competence": { - "niveau": 0, - "attribut1": "", - "attribut2": "", - "attribut3": "", - "doublebonus": false, - "predilections": [], - "templates": [ - "base" - ] - }, - "protection": { - "typeprotection": "", - "protection": 0, - "degats": "", - "rarete": 0, - "prix": 0, - "equipped": false, - "templates": [ - "base" - ] - }, - "bouclier": { - "bonusdefense": 0, - "degats": "", - "nonletaux": false, - "rarete": 0, - "prix": 0, - "equipped": false, - "templates": [ - "base" - ] - }, - "monnaie": { - "quantite": 0, - "unite": "", - "templates": [ - "base" - ] - } + "pouvoir": { + "chemin": "force", + "attribut": "cla", + "competence": "", + "seuil": 0, + "coutpsyche": 0, + "complexite": 0, + "cible": "", + "duree": "", + "formulesimple": "", + "formuleetendue": "", + "templates": [ + "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, + "dureerealisation": "", + "tempsmiseenroute": "", + "defautcourant": "", + "competence": "", + "templates": [ + "base" + ] + }, + "mutation": { + "templates": [ + "base" + ] + }, + "peuple": { + "templates": [ + "base" + ] + }, + "origine": { + "templates": [ + "base" + ] + }, + "heritage": { + "templates": [ + "base" + ] + }, + "metier": { + "templates": [ + "base" + ] + }, + "capacite": { + "templates": [ + "base" + ] + }, + "equipement": { + "rarete": 0, + "prix": 0, + "templates": [ + "base" + ] + }, + "arme": { + "typearme": "", + "isdefense": false, + "bonusmaniementoff": 0, + "bonusmaniementdef": 0, + "degats": "", + "nonletaux": false, + "deuxmains": false, + "courte": 0, + "moyenne": 0, + "longue": 0, + "tr": 0, + "rarete": 0, + "prix": 0, + "equipped": false, + "templates": [ + "base" + ] + }, + "competence": { + "niveau": 0, + "attribut1": "", + "attribut2": "", + "attribut3": "", + "doublebonus": false, + "predilections": [], + "templates": [ + "base" + ] + }, + "protection": { + "typeprotection": "", + "protection": 0, + "degats": "", + "rarete": 0, + "prix": 0, + "equipped": false, + "templates": [ + "base" + ] + }, + "bouclier": { + "bonusdefense": 0, + "degats": "", + "nonletaux": false, + "rarete": 0, + "prix": 0, + "equipped": false, + "templates": [ + "base" + ] + }, + "monnaie": { + "quantite": 0, + "unite": "", + "templates": [ + "base" + ] } +} } \ No newline at end of file diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index fa07ee1..8141c47 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -240,7 +240,7 @@ {{#each pouvoirs as |pouvoir key|}} -