Compare commits

...

21 Commits

Author SHA1 Message Date
4eece5aaf4 Correction sur carte europe 2024-06-18 17:26:55 +02:00
b574ba76ef Fix combativite 2024-06-01 09:17:57 +02:00
0b9e1a80af Fix talents + artefacts 2024-05-31 23:25:43 +02:00
6505b1c969 Fix talents + artefacts 2024-05-31 23:16:28 +02:00
280e90d7a6 Fix initiative 2024-05-31 14:03:36 +02:00
4fa9a911a0 Ameliorations creatures 2024-05-30 08:30:29 +02:00
b8c61f8f12 Fix sheets 2024-05-24 08:25:25 +02:00
b47b14a4b1 Fix sheets 2024-05-24 08:24:40 +02:00
9391acf6ee Add v12 support 2024-05-23 11:33:02 +02:00
8af9c582bf Preparation du passage en v12 2024-05-05 18:06:29 +02:00
fac158e0ad Fix v11/v12 2024-05-02 09:27:16 +02:00
69a2f81ede Correction sur SD à distance 2024-04-24 20:39:39 +02:00
005d390941 Support de toutes les options de combat 2024-04-01 22:48:18 +02:00
3327109f7e Compendiusm again 2024-02-24 17:03:57 +01:00
b38bfc97c2 Compendiusm again 2024-02-24 17:03:31 +01:00
89a7730d43 Ajout des mutations 2024-02-24 15:55:29 +01:00
2ebd1bd1fd Ajout des mutations 2024-02-24 15:54:47 +01:00
9e023d3f01 Fix calcul defense 2024-02-15 11:47:15 +01:00
2c12ec38fb Enhance stats 2024-02-08 12:51:41 +01:00
38059232cb Automatisations de combats, WIP 2023-12-28 18:40:46 +01:00
c331604393 Predilections et warning 2023-12-21 21:02:11 +01:00
141 changed files with 2727 additions and 1707 deletions

4
.gitignore vendored
View File

@@ -8,7 +8,3 @@ todo.md
/jsconfig.json
/package.json
/package-lock.json
/packs/*/
/packs/*/CURRENT
/packs/*/LOG
/packs/*/LOCK

BIN
assets/icons/mutation.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 807 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 384 KiB

View File

@@ -1,25 +1,25 @@
{
"ACTOR": {
"TypePersonnage": "Personnage",
"TypeCellule": "Cellule",
"TypeCreature": "Créature"
"TYPES": {
"Actor": {
"personnage": "Personnage",
"cellule": "Cellule",
"creature": "Créature"
},
"ITEM": {
"TypeArtefact": "Artefact",
"TypeArme": "Arme",
"TypeTalent": "Talent",
"TypeHistorique": "Historique",
"TypeProfil": "Profil",
"TypeCompetence": "Compétence",
"TypeProtection": "Protection",
"TypeMonnaie": "Monnaie",
"TypeEquipement": "Equipement",
"TypeRessource": "Ressource",
"TypeContact": "Contact"
"Item": {
"artefact": "Artefact",
"arme": "Arme",
"talent": "Talent",
"historique": "Historique",
"profil": "Profil",
"competence": "Compétence",
"protection": "Protection",
"monnaie": "Monnaie",
"equipement": "Equipement",
"ressource": "Ressource",
"contact": "Contact",
"mutation": "Mutation"
}
},
"HAWKMOON": {
"ui": {
"editContact": "Modifier le contact",

View File

@@ -12,7 +12,7 @@ export class HawkmoonActorSheet extends ActorSheet {
/** @override */
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
return foundry.utils.mergeObject(super.defaultOptions, {
classes: ["fvtt-hawkmoon-cyd", "sheet", "actor"],
template: "systems/fvtt-hawkmoon-cyd/templates/actor-sheet.html",
width: 640,
@@ -25,7 +25,7 @@ export class HawkmoonActorSheet extends ActorSheet {
/* -------------------------------------------- */
async getData() {
const objectData = duplicate(this.object)
const objectData = foundry.utils.duplicate(this.object)
let formData = {
title: this.title,
@@ -39,26 +39,30 @@ export class HawkmoonActorSheet extends ActorSheet {
effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
limited: this.object.limited,
skills: this.actor.getSkills(),
armes: duplicate(this.actor.getWeapons()),
monnaies: duplicate(this.actor.getMonnaies()),
protections: duplicate(this.actor.getArmors()),
historiques: duplicate(this.actor.getHistoriques() || []),
talents: duplicate(this.actor.getTalents() || []),
armes: foundry.utils.duplicate(this.actor.getWeapons()),
monnaies: foundry.utils.duplicate(this.actor.getMonnaies()),
protections: foundry.utils.duplicate(this.actor.getArmors()),
historiques: foundry.utils.duplicate(this.actor.getHistoriques() || []),
talents: foundry.utils.duplicate(this.actor.getTalents() || []),
mutations: foundry.utils.duplicate(this.actor.getMutations() || []),
talentsCell: this.getCelluleTalents(),
profils: duplicate(this.actor.getProfils() || []),
profils: foundry.utils.duplicate(this.actor.getProfils() || []),
combat: this.actor.getCombatValues(),
equipements: duplicate(this.actor.getEquipments()),
artefacts: duplicate(this.actor.getArtefacts()),
monnaies: duplicate(this.actor.getMonnaies()),
equipements: foundry.utils.duplicate(this.actor.getEquipments()),
artefacts: foundry.utils.duplicate(this.actor.getArtefacts()),
richesse: this.actor.computeRichesse(),
coupDevastateur: this.actor.items.find(it => it.type =="talent" && it.name.toLowerCase() == "coup devastateur" && !it.system.used),
valeurEquipement: this.actor.computeValeurEquipement(),
nbCombativite: this.actor.system.sante.nbcombativite,
combativiteList: HawkmoonUtility.getCombativiteList(this.actor.system.sante.nbcombativite),
initiative: this.actor.getFlag("world", "last-initiative") || -1,
description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}),
habitat: await TextEditor.enrichHTML(this.object.system.biodata.habitat, {async: true}),
options: this.options,
owner: this.document.isOwner,
editScore: this.options.editScore,
isGM: game.user.isGM
isGM: game.user.isGM,
config: game.system.hawkmoon.config
}
this.formData = formData;
@@ -143,6 +147,23 @@ export class HawkmoonActorSheet extends ActorSheet {
let armeId = li.data("item-id")
this.actor.rollArmeOffensif(armeId)
})
html.find('.roll-assommer').click((event) => {
this.actor.rollAssommer()
})
html.find('.roll-coup-bas').click((event) => {
this.actor.rollCoupBas()
})
html.find('.roll-immobiliser').click((event) => {
this.actor.rollImmobiliser()
})
html.find('.roll-repousser').click((event) => {
this.actor.rollRepousser()
})
html.find('.roll-desengager').click((event) => {
this.actor.rollDesengager()
})
html.find('.roll-arme-degats').click((event) => {
const li = $(event.currentTarget).parents(".item")
let armeId = li.data("item-id")

View File

@@ -67,21 +67,22 @@ export class HawkmoonActor extends Actor {
/* -------------------------------------------- */
prepareArme(arme) {
arme = duplicate(arme)
arme = foundry.utils.duplicate(arme)
let combat = this.getCombatValues()
if (arme.system.typearme == "contact" || arme.system.typearme == "contactjet") {
let bonusDefense = this.getBonusDefenseFromTalents()
arme.system.competence = duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "mêlée"))
arme.system.competence = foundry.utils.duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "mêlée"))
arme.system.attrKey = "pui"
arme.system.totalDegats = arme.system.degats + "+" + combat.bonusDegatsTotal
arme.system.totalOffensif = this.system.attributs.pui.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff
arme.system.totalDefensif = combat.defenseTotal + arme.system.competence.system.niveau + arme.system.seuildefense + bonusDefense
arme.system.totalOffensif = this.system.attributs.pui.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff + (this.system.combat.monte ? 3 : 0)
arme.system.totalDefensif = combat.defenseTotal + arme.system.competence.system.niveau + arme.system.seuildefense + bonusDefense + (this.system.combat.monte ? 3 : 0)
console.log("Arme", arme.system.totalDefensif, combat, arme.system.competence.system.niveau, arme.system.seuildefense, bonusDefense)
arme.system.isdefense = true
arme.system.isMelee = true
arme.system.isDistance = false
}
if (arme.system.typearme == "jet" || arme.system.typearme == "tir") {
arme.system.competence = duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "armes à distance"))
arme.system.competence = foundry.utils.duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "armes à distance"))
arme.system.attrKey = "adr"
arme.system.totalOffensif = this.system.attributs.adr.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff
arme.system.totalDegats = arme.system.degats
@@ -137,12 +138,15 @@ export class HawkmoonActor extends Actor {
getContacts() {
return this.getItemSorted(["contact"])
}
getMutations() {
return this.getItemSorted(["mutation"])
}
/* -------------------------------------------- */
getSkills() {
let comp = []
for (let item of this.items) {
item = duplicate(item)
item = foundry.utils.duplicate(item)
if (item.type == "competence") {
item.system.attribut1total = item.system.niveau + (this.system.attributs[item.system.attribut1]?.value || 0)
item.system.attribut2total = item.system.niveau + (this.system.attributs[item.system.attribut2]?.value || 0)
@@ -164,7 +168,7 @@ export class HawkmoonActor extends Actor {
/* ----------------------- --------------------- */
addMember(actorId) {
let members = duplicate(this.system.members)
let members = foundry.utils.duplicate(this.system.members)
members.push({ id: actorId })
this.update({ 'system.members': members })
}
@@ -175,7 +179,7 @@ export class HawkmoonActor extends Actor {
/* -------------------------------------------- */
getDefenseBase() {
return Math.max(this.system.attributs.tre.value, this.system.attributs.pui.value)
return Math.max(this.system.attributs.tre.value, this.system.attributs.adr.value)
}
/* -------------------------------------------- */
@@ -185,7 +189,7 @@ export class HawkmoonActor extends Actor {
/* -------------------------------------------- */
getProtection() {
let equipProtection = 0
for (let armor in this.items) {
for (let armor of this.items) {
if (armor.type == "protection" && armor.system.equipped) {
equipProtection += Number(armor.system.protection)
}
@@ -207,7 +211,7 @@ export class HawkmoonActor extends Actor {
vitesseTotal: this.getVitesseBase() + this.system.combat.vitessebonus,
defenseBase: this.getDefenseBase(),
protection: this.getProtection(),
defenseTotal: this.getDefenseBase() + this.system.combat.defensebonus + this.getProtection() - this.getTotalAdversite()
defenseTotal: this.getDefenseBase() + this.system.combat.defensebonus + this.getProtection() - this.getTotalAdversite() + (this.system.combat.defensetotale ? 3 : 0)
}
return combat
}
@@ -231,21 +235,28 @@ export class HawkmoonActor extends Actor {
this.update({ 'system.sante.vigueur': vigueur })
}
}
super.prepareDerivedData()
}
/* -------------------------------------------- */
_preUpdate(changed, options, user) {
if (changed?.system?.sante?.etat && changed?.system?.sante?.etat != this.system.sante.etat) {
setTimeout(() => {
this.processCombativite(changed.system.sante)
}, 800)
}
super._preUpdate(changed, options, user);
}
/* -------------------------------------------- */
_onUpdate(data, options, user) {
super._onUpdate(data, options, user);
}
/* -------------------------------------------- */
getItemById(id) {
let item = this.items.find(item => item.id == id);
if (item) {
item = duplicate(item)
item = foundry.utils.duplicate(item)
}
return item;
}
@@ -278,7 +289,7 @@ export class HawkmoonActor extends Actor {
checkAttribut(attribut, minLevel) {
let attr = this.system.attributs.find(at => at.labelnorm == attribut.toLowerCase())
if (attr && attr.value >= minLevel) {
return { isValid: true, attr: duplicate(attr) }
return { isValid: true, attr: foundry.utils.duplicate(attr) }
}
return { isValid: false }
}
@@ -286,11 +297,11 @@ export class HawkmoonActor extends Actor {
checkAttributOrCompetenceLevel(compName, minLevel) {
let comp = this.items.find(i => i.type == "competence" && i.name.toLowerCase() == compName.toLowerCase() && i.system.niveau >= minLevel)
if (comp) {
return { isValid: true, item: duplicate(comp) }
return { isValid: true, item: foundry.utils.duplicate(comp) }
} else {
for (let attrKey in this.system.attributs) {
if (this.system.attributs[attrKey].label.toLowerCase() == compName.toLowerCase() && this.system.attributs[attrKey].value >= minLevel) {
return { isValid: true, item: duplicate(this.system.attributs[attrKey]) }
return { isValid: true, item: foundry.utils.duplicate(this.system.attributs[attrKey]) }
}
}
}
@@ -300,7 +311,7 @@ export class HawkmoonActor extends Actor {
addCompetenceBonus(compName, bonus, baCost) {
let comp = this.items.find(i => i.type == "competence" && i.name.toLowerCase() == compName.toLowerCase())
if (comp) {
comp = duplicate(comp)
comp = foundry.utils.duplicate(comp)
comp.system.bonus = bonus
comp.system.baCost = baCost
return { isValid: true, item: comp }
@@ -382,10 +393,42 @@ export class HawkmoonActor extends Actor {
return 0;
}
/* -------------------------------------------- */
changeEtatCombativite(value) {
if (value === "vaincu") {
value = 200
}
let sante = foundry.utils.duplicate(this.system.sante)
sante.etat += Number(value)
sante.etat = Math.max(sante.etat, 0)
sante.etat = Math.min(sante.etat, this.system.sante.nbcombativite)
this.update({ 'system.sante': sante })
if (sante.etat == this.system.sante.nbcombativite) {
ChatMessage.create({ content: `<strong>${this.name} est vaincu !</strong>` })
}
this.processCombativite(sante)
}
/* -------------------------------------------- */
processCombativite(sante) {
sante = sante || foundry.utils.duplicate(this.system.sante)
// Gestion des états affaibli et très affaibli
if (sante.etat == this.system.sante.nbcombativite - 2 || sante.etat == this.system.sante.nbcombativite - 1) {
if (sante.etat == this.system.sante.nbcombativite - 2 && this.items.find(item => item.type == "talent" && item.name.toLowerCase() == "encaissement")) {
ChatMessage.create({ content: `<strong>${this.name} ne subit pas les 2 adversités rouge grâce à Encaissement. Pensez à les ajouter à la fin de la scène !</strong>` })
} else if (sante.etat == this.system.sante.nbcombativite - 1 && this.items.find(item => item.type == "talent" && item.name.toLowerCase().includes("vaillant"))) {
ChatMessage.create({ content: `<strong>${this.name} ne subit pas les 2 adversités rouge grâce à Vaillant. Pensez à les ajouter à la fin de la scène !</strong>` })
} else {
ChatMessage.create({ content: `<strong>${this.name} subit 2 adversités rouge !</strong>` })
this.incDecAdversite("rouge", 2)
}
}
}
/* -------------------------------------------- */
async equipGear(equipmentId) {
let item = this.items.find(item => item.id == equipmentId);
if (item && item.system.data) {
if (item?.system?.data) {
let update = { _id: item.id, "system.equipped": !item.system.equipped };
await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
}
@@ -395,13 +438,13 @@ export class HawkmoonActor extends Actor {
getSubActors() {
let subActors = [];
for (let id of this.system.subactors) {
subActors.push(duplicate(game.actors.get(id)));
subActors.push(foundry.utils.duplicate(game.actors.get(id)));
}
return subActors;
}
/* -------------------------------------------- */
async addSubActor(subActorId) {
let subActors = duplicate(this.system.subactors);
let subActors = foundry.utils.duplicate(this.system.subactors);
subActors.push(subActorId);
await this.update({ 'system.subactors': subActors });
}
@@ -423,9 +466,10 @@ export class HawkmoonActor extends Actor {
/* -------------------------------------------- */
async incDecAdversite(adv, incDec = 0) {
let adversite = duplicate(this.system.adversite)
let adversite = foundry.utils.duplicate(this.system.adversite)
adversite[adv] += Number(incDec)
adversite[adv] = Math.max(adversite[adv], 0)
adversite[adv] = Math.min(adversite[adv], 20)
this.update({ 'system.adversite': adversite })
}
/* -------------------------------------------- */
@@ -434,7 +478,7 @@ export class HawkmoonActor extends Actor {
if (objetQ) {
let newQ = objetQ.system.quantite + incDec
newQ = Math.max(newQ, 0)
const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantite': newQ }]); // pdates one EmbeddedEntity
await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantite': newQ }]); // pdates one EmbeddedEntity
}
}
@@ -470,7 +514,7 @@ export class HawkmoonActor extends Actor {
/* -------------------------------------------- */
async setPredilectionUsed(compId, predIdx) {
let comp = this.items.get(compId)
let pred = duplicate(comp.system.predilections)
let pred = foundry.utils.duplicate(comp.system.predilections)
pred[predIdx].used = true
await this.updateEmbeddedDocuments('Item', [{ _id: compId, 'system.predilections': pred }])
}
@@ -492,7 +536,7 @@ export class HawkmoonActor extends Actor {
}
if (arme.system.totalDefensif > maxDef) {
maxDef = arme.system.totalDefensif
bestArme = duplicate(arme)
bestArme = foundry.utils.duplicate(arme)
}
}
return bestArme
@@ -507,7 +551,7 @@ export class HawkmoonActor extends Actor {
for (let auto of talent.system.automations) {
if (auto.eventtype === "prepare-roll") {
if (auto.competence.toLowerCase() == competence.name.toLowerCase()) {
talent = duplicate(talent)
talent = foundry.utils.duplicate(talent)
talent.system.bonus = auto.bonus
talent.system.baCost = auto.baCost
talents.push(talent)
@@ -538,22 +582,34 @@ export class HawkmoonActor extends Actor {
rollData.nbBA = this.system.bonneaventure.actuelle
rollData.nbAdversites = this.getTotalAdversite()
rollData.talents = []
rollData.attrKey2 = "none"
rollData.coupDevastateur = this.items.find(it => it.type == "talent" && it.name.toLowerCase() == "coup dévastateur" && !it.system.used)
rollData.hasAmbidextre = this.items.find(it => it.type == "talent" && it.name.toLowerCase() == "ambidextre")
rollData.hasFeinte = this.system.bonneaventure.actuelle > 0 && this.items.find(it => it.type == "talent" && it.name.toLowerCase() == "feinte")
rollData.isMonte = this.system.combat.monte
rollData.config = game.system.hawkmoon.config
if (attrKey) {
rollData.attrKey = attrKey
if (attrKey != "tochoose") {
rollData.actionImg = "systems/fvtt-hawkmoon-cyd/assets/icons/" + this.system.attributs[attrKey].labelnorm + ".webp"
rollData.attr = duplicate(this.system.attributs[attrKey])
rollData.attr = foundry.utils.duplicate(this.system.attributs[attrKey])
}
}
if (compId) {
rollData.competence = duplicate(this.items.get(compId) || {})
rollData.maitrises = rollData.competence.system.predilections.filter(p => p.maitrise)
rollData.competence = foundry.utils.duplicate(this.items.get(compId) || {})
let maitrises = [{ key: "none", label: "Aucune" }]
rollData.competence.system.predilections.forEach(function (item) {
if (item.maitrise) {
maitrises.push({ key: item.id, label: item.name });
}
})
rollData.maitrises = maitrises // rollData.competence.system.predilections.filter(p => p.maitrise)
rollData.actionImg = rollData.competence?.img
rollData.talents = this.searchRelevantTalents(rollData.competence)
}
if (compName) {
rollData.competence = duplicate(this.items.find(item => item.name.toLowerCase() == compName.toLowerCase()) || {})
rollData.competence = foundry.utils.duplicate(this.items.find(item => item.name.toLowerCase() == compName.toLowerCase()) || {})
rollData.actionImg = rollData.competence?.img
}
return rollData
@@ -590,6 +646,53 @@ export class HawkmoonActor extends Actor {
let rollDialog = await HawkmoonRollDialog.create(this, rollData)
rollDialog.render(true)
}
/* -------------------------------------------- */
async rollAssommer() {
let rollData = this.getCommonRollData("pui", undefined, "Filouterie")
rollData.assomer = true
rollData.conditionsCommunes = true
HawkmoonUtility.updateWithTarget(rollData)
let rollDialog = await HawkmoonRollDialog.create(this, rollData)
rollDialog.render(true)
}
/* -------------------------------------------- */
async rollCoupBas() {
let rollData = this.getCommonRollData("pui", undefined, "Mêlée")
rollData.coupBas = true
rollData.conditionsCommunes = true
HawkmoonUtility.updateWithTarget(rollData)
let rollDialog = await HawkmoonRollDialog.create(this, rollData)
rollDialog.render(true)
}
/* -------------------------------------------- */
async rollImmobiliser() {
let rollData = this.getCommonRollData("pui", undefined, "Mêlée")
rollData.immobiliser = true
rollData.conditionsCommunes = true
rollData.cibleconsciente = true
HawkmoonUtility.updateWithTarget(rollData)
let rollDialog = await HawkmoonRollDialog.create(this, rollData)
rollDialog.render(true)
}
/* -------------------------------------------- */
async rollRepousser() {
let rollData = this.getCommonRollData("pui", undefined, "Mêlée")
rollData.repousser = true
rollData.conditionsCommunes = true
rollData.cibleconsciente = true
HawkmoonUtility.updateWithTarget(rollData)
let rollDialog = await HawkmoonRollDialog.create(this, rollData)
rollDialog.render(true)
}
/* -------------------------------------------- */
async rollDesengager() {
let rollData = this.getCommonRollData("adr", undefined, "Mouvements")
rollData.desengager = true
rollData.conditionsCommunes = true
HawkmoonUtility.updateWithTarget(rollData)
let rollDialog = await HawkmoonRollDialog.create(this, rollData)
rollDialog.render(true)
}
/* -------------------------------------------- */
async rollArmeDegats(armeId, targetVigueur = undefined, rollDataInput = undefined) {
@@ -597,31 +700,48 @@ export class HawkmoonActor extends Actor {
if (arme.type == "arme") {
arme = this.prepareArme(arme)
}
console.log("DEGATS", arme)
console.log("DEGATS", arme, targetVigueur, rollDataInput)
let roll
let bonus = 0
let bonus2 = 0
if (rollDataInput?.applyCoupDevastateur) {
bonus2 = Math.floor(this.system.attributs.pui.value / 2)
let talent = this.items.find(item => item.type == "talent" && item.name.toLowerCase() == "coup dévastateur")
this.updateEmbeddedDocuments('Item', [{ _id: talent.id, 'system.used': true }])
}
if (rollDataInput?.isHeroique) {
if (rollDataInput?.attaqueCharge) {
bonus = 5
}
roll = new Roll("2d10rr10+" + arme.system.totalDegats + "+" + bonus).roll({ async: false })
if (rollDataInput?.chargeCavalerie) {
bonus = 6
}
roll = await new Roll("2d10rr10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll()
} else {
if (rollDataInput?.attaqueCharge) {
bonus = 3
}
roll = new Roll("1d10+" + arme.system.totalDegats + "+" + bonus).roll({ async: false })
if (rollDataInput?.chargeCavalerie) {
bonus = 4
}
roll = await new Roll("1d10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll()
}
await HawkmoonUtility.showDiceSoNice(roll, game.settings.get("core", "rollMode"));
let nbEtatPerdus = 0
if (targetVigueur) {
nbEtatPerdus = Math.floor(roll.total / targetVigueur)
}
//console.log(roll)
let rollData = {
arme: arme,
finalResult: roll.total,
formula: roll.formula,
alias: this.name,
actorImg: this.img,
actorId: this.id,
defenderTokenId: rollDataInput?.defenderTokenId,
actionImg: arme.img,
targetVigueur: targetVigueur,
nbEtatPerdus: nbEtatPerdus
@@ -630,5 +750,9 @@ export class HawkmoonActor extends Actor {
content: await renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-degats-result.html`, rollData)
})
if (rollDataInput?.defenderTokenId && nbEtatPerdus) {
HawkmoonUtility.applyCombativite(rollDataInput, nbEtatPerdus)
}
}
}

View File

@@ -14,10 +14,10 @@ export class HawkmoonAutomation {
this.__objectTypes = { }
Object.entries(game.data.model.Actor).forEach(kv => {
this.__objectTypes[kv[0]] = duplicate(kv[1])
this.__objectTypes[kv[0]] = foundry.utils.duplicate(kv[1])
})
Object.entries(game.data.model.Item).forEach(kv => {
this.__objectTypes[kv[0]] = duplicate(kv[1])
this.__objectTypes[kv[0]] = foundry.utils.duplicate(kv[1])
})
}

View File

@@ -15,7 +15,7 @@ export class HawkmoonCelluleSheet extends ActorSheet {
/** @override */
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
return foundry.utils.mergeObject(super.defaultOptions, {
classes: ["fvtt-hawkmoon-cyd", "sheet", "actor"],
template: "systems/fvtt-hawkmoon-cyd/templates/cellule-sheet.html",
width: 640,
@@ -28,7 +28,7 @@ export class HawkmoonCelluleSheet extends ActorSheet {
/* -------------------------------------------- */
async getData() {
const objectData = duplicate(this.object)
const objectData = foundry.utils.duplicate(this.object)
let formData = {
title: this.title,
@@ -41,15 +41,16 @@ export class HawkmoonCelluleSheet extends ActorSheet {
system: objectData.system,
effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
limited: this.object.limited,
talents: duplicate(this.actor.getTalents() || {}),
ressources: duplicate(this.actor.getRessources()),
contacts: duplicate(this.actor.getContacts()),
talents: foundry.utils.duplicate(this.actor.getTalents() || {}),
ressources: foundry.utils.duplicate(this.actor.getRessources()),
contacts: foundry.utils.duplicate(this.actor.getContacts()),
members: this.getMembers(),
description: await TextEditor.enrichHTML(this.object.system.description, { async: true }),
options: this.options,
owner: this.document.isOwner,
editScore: this.options.editScore,
isGM: game.user.isGM
isGM: game.user.isGM,
config: game.system.hawkmoon.config
}
this.formData = formData;

View File

@@ -6,9 +6,9 @@ export class HawkmoonCombat extends Combat {
/* -------------------------------------------- */
async rollInitiative(ids, formula = undefined, messageOptions = {} ) {
ids = typeof ids === "string" ? [ids] : ids;
for (let cId = 0; cId < ids.length; cId++) {
const c = this.combatants.get(ids[cId]);
//console.log("Init for combattant", c )
for (let cId of ids) {
const c = this.combatants.get(cId);
console.log("Init for combattant", c, ids)
let id = c._id || c.id
let initValue = c.actor ? c.actor.getInitiativeScore() : 0
await this.updateEmbeddedDocuments("Combatant", [ { _id: id, initiative: initValue } ]);
@@ -21,5 +21,4 @@ export class HawkmoonCombat extends Combat {
_onUpdate(changed, options, userId) {
}
}

111
modules/hawkmoon-config.js Normal file
View File

@@ -0,0 +1,111 @@
export const HAWKMOON_CONFIG = {
optionsDifficulte: [
{ key: "0", label: "Aucune/Inconnue" },
{ key: "5", label: "Facile (5)" },
{ key: "10", label: "Moyenne (10)" },
{ key: "15", label: "Ardue (15)" },
{ key: "20", label: "Hasardeuse (20)" },
{ key: "25", label: "Insensée (25)" },
{ key: "30", label: "Pure Folie (30)" }
],
optionsDistanceTir: [
{ key: "porteecourte", label: "Courte ({protectionDefenseur}+5)" },
{ key: "porteemoyenne", label: "Moyenne ({protectionDefenseur}+9)" },
{ key: "porteelongue", label: "Longue ({protectionDefenseur}+14)" }
],
optionsBonusMalus: [
{ key: "-4", label: "-4" },
{ key: "-3", label: "-3" },
{ key: "-2", label: "-2" },
{ key: "-1", label: "-1" },
{ key: "0", label: "0" },
{ key: "1", label: "+1" },
{ key: "2", label: "+2" },
{ key: "3", label: "+3" },
{ key: "4", label: "+4" }
],
optionsTailleCible: [
{ key: "normal", label: "Normal (SD+0)" },
{ key: "main", label: "Main (SD+10)" },
{ key: "enfant", label: "Enfant (SD+3)" },
{ key: "maison", label: "Maison (SD-10)" }
],
optionsCouvert: [
{ key: "aucun", label: "Aucun" },
{ key: "leger", label: "Léger (SD+5)" },
{ key: "complet", label: "Quasi complet (SD+10)" }
],
optionsTireurDeplacement: [
{ key: "immobile", label: "Immobile (SD+0)" },
{ key: "lent", label: "Lent (SD+3)" },
{ key: "rapide", label: "Rapide (SD+5)" }
],
optionsSoutiens: [
{ key: "0", label: "Aucun" },
{ key: "1", label: "Un soutien (+3)" },
{ key: "2", label: "Deux soutiens (+4)" },
{ key: "3", label: "Trois soutiens (+5)" }
],
optionsStatutResistant: [
{ key: "commun", label: "Commun" },
{ key: "clandestin", label: "Clandestin" },
{ key: "insurge", label: "Insurgé" }
],
optionsTypeArme: [
{key: "contact", label: "Arme de contact"},
{key: "contactjet", label: "Arme de contact et de Jet"},
{key: "jet", label: "Arme de Jet"},
{key: "tir", label: "Arme de Tir"}
],
optionsArtefactBranche: [
{key: "alchimie", label: "Alchimie"},
{key: "biologie", label: "Biologie"},
{key: "electricite", label: "Electricité"},
{key: "mecanique", label: "Mécanique"},
{key: "scienceesprit", label: "Science de l'Esprit"}
],
optionsArtefactBranche2: [
{key: "none", label: "Aucune"},
{key: "alchimie", label: "Alchimie"},
{key: "biologie", label: "Biologie"},
{key: "electricite", label: "Electricité"},
{key: "mecanique", label: "Mécanique"},
{key: "scienceesprit", label: "Science de l'Esprit"}
],
optionsTypeContact: [
{key: "contact", label: "Contact"},
{key: "allie", label: "Allié"}
],
optionsTypeMutation: [
{key: "tares_communes", label: "Tares et Malformations communes"},
{key: "evolutions_communes", label: "Evolutions communes"},
{key: "tares_rares", label: "Tares et Malformations rares"},
{key: "evolutions_rares", label: "Evolutions rares"},
{key: "tares_majeures", label: "Tares et Maformations majeures"},
{key: "evolutions_majeures", label: "Evolutions majeures"},
{key: "tares_except", label: "Tares et Malformations exceptionnelles"},
{key: "evolutions_except", label: "Evolutions exceptionnelles"}
],
optionsTypeTalent: [
{key: "personnage", label: "Personnage"},
{key: "cellule", label: "Cellule"},
{key: "traitespece", label: "Trait d'espèce"}
],
optionsUseTalent: [
{key: "permanent", label: "Permanent"},
{key: "sceance", label: "Une fois par scéance"},
{key: "scenario", label: "Une fois par scénario"},
{key: "jour", label: "Une fois par jour"},
{key: "unique", label: "Unique"}
],
optionsAutomationEvent: [
{key: "on-drop", label: "Drop sur l'acteur"},
{key: "prepare-roll", label: "Préparation d'un jet"},
{key: "bonus-permanent", label: "Bonus permanent"}
],
optionsBonusPermanent: [
{key: "vigueur", label: "Vigueur"},
{key: "bonus-defensif", label: "Bonus au Seuil de Défense"}
]
}

View File

@@ -13,7 +13,7 @@ export class HawkmoonCreatureSheet extends HawkmoonActorSheet {
/** @override */
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
return foundry.utils.mergeObject(super.defaultOptions, {
classes: ["fvtt-hawkmoon-cyd", "sheet", "actor"],
template: "systems/fvtt-hawkmoon-cyd/templates/creature-sheet.html",
width: 640,

View File

@@ -9,7 +9,7 @@ export class HawkmoonItemSheet extends ItemSheet {
/** @override */
static get defaultOptions() {
return mergeObject(super.defaultOptions, {
return foundry.utils.mergeObject(super.defaultOptions, {
classes: ["fvtt-hawkmoon-cyd", "sheet", "item"],
template: "systems/fvtt-hawkmoon-cyd/templates/item-sheet.html",
dragDrop: [{ dragSelector: null, dropSelector: null }],
@@ -48,7 +48,7 @@ export class HawkmoonItemSheet extends ItemSheet {
/* -------------------------------------------- */
async getData() {
const objectData = duplicate(this.object)
const objectData = foundry.utils.duplicate(this.object)
let formData = {
title: this.title,
id: this.id,
@@ -64,7 +64,8 @@ export class HawkmoonItemSheet extends ItemSheet {
owner: this.document.isOwner,
description: await TextEditor.enrichHTML(this.object.system.description, {async: true}),
mr: (this.object.type == 'specialisation'),
isGM: game.user.isGM
isGM: game.user.isGM,
config: game.system.hawkmoon.config
}
if ( objectData.type == "don") {
@@ -89,7 +90,7 @@ export class HawkmoonItemSheet extends ItemSheet {
/* -------------------------------------------- */
postItem() {
let chatData = duplicate(HawkmoonUtility.data(this.item));
let chatData = foundry.utils.duplicate(HawkmoonUtility.data(this.item));
if (this.actor) {
chatData.actor = { id: this.actor.id };
}
@@ -132,7 +133,7 @@ export class HawkmoonItemSheet extends ItemSheet {
html.find('.edit-predilection').change(ev => {
const li = $(ev.currentTarget).parents(".prediction-item")
let index = li.data("prediction-index")
let pred = duplicate(this.object.system.predilections)
let pred = foundry.utils.duplicate(this.object.system.predilections)
pred[index].name = ev.currentTarget.value
pred[index].id = pred[index].id || randomID(16)
this.object.update( { 'system.predilections': pred })
@@ -140,7 +141,7 @@ export class HawkmoonItemSheet extends ItemSheet {
html.find('.edit-predilection-description').change(ev => {
const li = $(ev.currentTarget).parents(".prediction-item")
let index = li.data("prediction-index")
let pred = duplicate(this.object.system.predilections)
let pred = foundry.utils.duplicate(this.object.system.predilections)
pred[index].description = ev.currentTarget.value
pred[index].id = pred[index].id || randomID(16)
this.object.update( { 'system.predilections': pred })
@@ -148,7 +149,7 @@ export class HawkmoonItemSheet extends ItemSheet {
html.find('.predilection-acquise').change(ev => {
const li = $(ev.currentTarget).parents(".prediction-item")
let index = li.data("prediction-index")
let pred = duplicate(this.object.system.predilections)
let pred = foundry.utils.duplicate(this.object.system.predilections)
pred[index].acquise = ev.currentTarget.checked
pred[index].id = pred[index].id || randomID(16)
this.object.update( { 'system.predilections': pred })
@@ -156,7 +157,7 @@ export class HawkmoonItemSheet extends ItemSheet {
html.find('.predilection-maitrise').change(ev => {
const li = $(ev.currentTarget).parents(".prediction-item")
let index = li.data("prediction-index")
let pred = duplicate(this.object.system.predilections)
let pred = foundry.utils.duplicate(this.object.system.predilections)
pred[index].maitrise = ev.currentTarget.checked
pred[index].id = pred[index].id || randomID(16)
this.object.update( { 'system.predilections': pred })
@@ -164,41 +165,41 @@ export class HawkmoonItemSheet extends ItemSheet {
html.find('.predilection-used').change(ev => {
const li = $(ev.currentTarget).parents(".prediction-item")
let index = li.data("prediction-index")
let pred = duplicate(this.object.system.predilections)
let pred = foundry.utils.duplicate(this.object.system.predilections)
pred[index].used = ev.currentTarget.checked
pred[index].id = pred[index].id || randomID(16)
this.object.update( { 'system.predilections': pred })
})
html.find('#add-predilection').click(ev => {
let pred = duplicate(this.object.system.predilections)
let pred = foundry.utils.duplicate(this.object.system.predilections)
pred.push( { name: "Nouvelle prédilection", id: randomID(16), used: false })
this.object.update( { 'system.predilections': pred })
})
html.find('.delete-prediction').click(ev => {
const li = $(ev.currentTarget).parents(".prediction-item")
let index = li.data("prediction-index")
let pred = duplicate(this.object.system.predilections)
let pred = foundry.utils.duplicate(this.object.system.predilections)
pred.splice(index,1)
this.object.update( { 'system.predilections': pred })
})
html.find('#add-automation').click(ev => {
let autom = duplicate(this.object.system.automations)
let autom = foundry.utils.duplicate(this.object.system.automations)
autom.push( { eventtype: "on-drop", name: "Automatisation 1", bonusname: "vigueur", bonus: 0, competence: "", minLevel: 0, baCost: 0, id: randomID(16) })
this.object.update( { 'system.automations': autom })
})
html.find('.delete-automation').click(ev => {
const li = $(ev.currentTarget).parents(".automation-item")
let index = li.data("automation-index")
let autom = duplicate(this.object.system.automations)
let autom = foundry.utils.duplicate(this.object.system.automations)
autom.splice(index,1)
this.object.update( { 'system.automations': autom })
})
html.find('.automation-edit-field').change(ev => {
let index = $(ev.currentTarget).data("automation-index")
let field = $(ev.currentTarget).data("automation-field")
let auto = duplicate(this.object.system.automations)
let auto = foundry.utils.duplicate(this.object.system.automations)
auto[index][field] = ev.currentTarget.value
auto[index].id = auto[index].id || randomID(16)
this.object.update( { 'system.automations': auto })

View File

@@ -13,6 +13,7 @@ export const defaultItemImg = {
artefact: "systems/fvtt-hawkmoon-cyd/assets/icons/artefact.webp",
contact: "systems/fvtt-hawkmoon-cyd/assets/icons/contacts.webp",
ressource: "systems/fvtt-hawkmoon-cyd/assets/icons/ressources.webp",
mutation: "systems/fvtt-hawkmoon-cyd/assets/icons/mutation.webp",
}
/**

View File

@@ -18,6 +18,7 @@ import { HawkmoonCombat } from "./hawkmoon-combat.js";
import { HawkmoonItem } from "./hawkmoon-item.js";
import { HawkmoonAutomation } from "./hawkmoon-automation.js";
import { HawkmoonTokenHud } from "./hawkmoon-hud.js";
import { HAWKMOON_CONFIG } from "./hawkmoon-config.js";
/* -------------------------------------------- */
/* Foundry VTT Initialization */
@@ -50,7 +51,8 @@ Hooks.once("init", async function () {
CONFIG.Item.documentClass = HawkmoonItem
game.system.hawkmoon = {
HawkmoonUtility,
HawkmoonAutomation
HawkmoonAutomation,
config : HAWKMOON_CONFIG
}
/* -------------------------------------------- */
@@ -83,28 +85,15 @@ function welcomeMessage() {
}
/* -------------------------------------------- */
// Register world usage statistics
function registerUsageCount(registerKey) {
if (game.user.isGM) {
game.settings.register(registerKey, "world-key", {
name: "Unique world key",
scope: "world",
config: false,
default: "",
type: String
});
let worldKey = game.settings.get(registerKey, "world-key")
if (worldKey == undefined || worldKey == "") {
worldKey = randomID(32)
game.settings.set(registerKey, "world-key", worldKey)
async function importDefaultScene() {
let exists = game.scenes.find(j => j.name == "Accueil");
if (!exists) {
const scenes = await HawkmoonUtility.loadCompendium("fvtt-hawkmoon-cyd.scenes")
let newDocuments = scenes.filter(i => i.name == "Accueil");
if (newDocuments) {
await game.scenes.documentClass.create(newDocuments);
game.scenes.find(i => i.name == "Accueil").activate();
}
// Simple API counter
let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
//$.ajaxSetup({
//headers: { 'Access-Control-Allow-Origin': '*' }
//})
$.ajax(regURL)
}
}
@@ -124,7 +113,14 @@ Hooks.once("ready", function () {
});
}
registerUsageCount('fvtt-hawkmoon-cyd')
import("https://www.uberwald.me/fvtt_appcount/count-class-ready.js").then(moduleCounter=>{
console.log("ClassCounter loaded", moduleCounter)
moduleCounter.ClassCounter.registerUsageCount()
}).catch(err=>
console.log("No stats available, giving up.")
)
importDefaultScene()
welcomeMessage()
});

View File

@@ -60,12 +60,16 @@ export class HawkmoonRollDialog extends Dialog {
html.find('#modificateur').change(async (event) => {
this.rollData.modificateur = Number(event.currentTarget.value)
})
html.find('#difficulte').change(async (event) => {
html.find('#difficulte').change( (event) => {
console.log("Difficulte: " + event.currentTarget.value)
this.rollData.difficulte = Number(event.currentTarget.value)
})
html.find('#attrKey').change(async (event) => {
this.rollData.attrKey = String(event.currentTarget.value)
})
html.find('#attrKey2').change(async (event) => {
this.rollData.attrKey2 = String(event.currentTarget.value)
})
html.find('#select-maitrise').change(async (event) => {
this.rollData.maitriseId = String(event.currentTarget.value)
})
@@ -90,6 +94,15 @@ export class HawkmoonRollDialog extends Dialog {
html.find('#defenseur-au-sol').change((event) => {
this.rollData.defenseurAuSol = event.currentTarget.checked
})
html.find('#ambidextre-1').change((event) => {
this.rollData.ambidextre1 = event.currentTarget.checked
})
html.find('#ambidextre-2').change((event) => {
this.rollData.ambidextre2 = event.currentTarget.checked
})
html.find('#attaque-monte').change((event) => {
this.rollData.attqueMonte = event.currentTarget.checked
})
html.find('#defenseur-aveugle').change((event) => {
this.rollData.defenseurAveugle = event.currentTarget.checked
})
@@ -105,6 +118,21 @@ export class HawkmoonRollDialog extends Dialog {
html.find('#attaque-charge').change((event) => {
this.rollData.attaqueCharge = event.currentTarget.checked
})
html.find('#charge-cavalerie').change((event) => {
this.rollData.chargeCavalerie = event.currentTarget.checked
})
html.find('#attaquants-multiple').change((event) => {
this.rollData.attaquantsMultiples = event.currentTarget.checked
})
html.find('#soutiens').change((event) => {
this.rollData.soutiens = Number(event.currentTarget.value)
})
html.find('#feinte').change((event) => {
this.rollData.feinte = event.currentTarget.checked
})
html.find('#contenir').change((event) => {
this.rollData.contenir = event.currentTarget.checked
})
html.find('#attaque-desarme').change((event) => {
this.rollData.attaqueDesarme = event.currentTarget.checked
})

View File

@@ -114,6 +114,26 @@ export class HawkmoonUtility {
let logoPause = "systems/fvtt-hawkmoon-cyd/assets/logos/" + game.settings.get("fvtt-hawkmoon-cyd", "hawkmoon-pause-logo") + ".webp"
let logoImg = document.querySelector('#pause').children[0]
logoImg.setAttribute('style', `content: url(${logoPause})`)
game.system.hawkmoon.config.listeNiveauSkill = this.createDirectOptionList(0, 10)
game.system.hawkmoon.config.listeNiveauCreature = this.createDirectOptionList(0, 35)
game.system.hawkmoon.config.listeNiveauContact = this.createDirectOptionList(1, 3)
}
/* -------------------------------------------- */
static createDirectOptionList(min, max) {
let options = {};
for (let i = min; i <= max; i++) {
options[`${i}`] = `${i}`;
}
return options;
}
static createArrayOptionList(min, max) {
let options = [];
for (let i = min; i <= max; i++) {
options.push({key:`${i}`, label:`${i}`});
}
return options;
}
/* -------------------------------------------- */
@@ -140,9 +160,9 @@ export class HawkmoonUtility {
let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
let message = game.messages.get(messageId)
let rollData = message.getFlag("world", "hawkmoon-roll")
let actor = this.getActorFromRollData(rollData)
let actor = HawkmoonUtility.getActorFromRollData(rollData)
await actor.setPredilectionUsed(rollData.competence._id, predIdx)
rollData.competence = duplicate(actor.getCompetence(rollData.competence._id))
rollData.competence = foundry.utils.duplicate(actor.getCompetence(rollData.competence._id))
HawkmoonUtility.rollHawkmoon(rollData)
})
@@ -150,9 +170,18 @@ export class HawkmoonUtility {
let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
let message = game.messages.get(messageId)
let rollData = message.getFlag("world", "hawkmoon-roll")
let actor = this.getActorFromRollData(rollData)
let actor = HawkmoonUtility.getActorFromRollData(rollData)
actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData)
})
html.on("click", '.roll-chat-degat-devastateur', async event => {
let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
let message = game.messages.get(messageId)
let rollData = message.getFlag("world", "hawkmoon-roll")
let actor = HawkmoonUtility.getActorFromRollData(rollData)
rollData.applyCoupDevastateur = true
actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData)
})
}
/* -------------------------------------------- */
@@ -163,10 +192,7 @@ export class HawkmoonUtility {
'systems/fvtt-hawkmoon-cyd/templates/partial-item-header.html',
'systems/fvtt-hawkmoon-cyd/templates/partial-item-description.html',
'systems/fvtt-hawkmoon-cyd/templates/partial-item-nav.html',
'systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau.html',
'systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau-creature.html',
'systems/fvtt-hawkmoon-cyd/templates/partial-item-prix.html',
'systems/fvtt-hawkmoon-cyd/templates/partial-sante-etat.html',
'systems/fvtt-hawkmoon-cyd/templates/partial-automation.html',
'systems/fvtt-hawkmoon-cyd/templates/hud-adversites.html',
]
@@ -247,30 +273,15 @@ export class HawkmoonUtility {
let id = rollData.rollId;
let oldRollData = this.rollDataStore[id] || {};
let newRollData = mergeObject(oldRollData, rollData);
let newRollData = foundry.utils.mergeObject(oldRollData, rollData);
this.rollDataStore[id] = newRollData;
}
/* -------------------------------------------- */
static saveRollData(rollData) {
game.socket.emit("system.fvtt-hawkmoon-cyd", {
name: "msg_update_roll", data: rollData
}); // Notify all other clients of the roll
this.updateRollData(rollData);
}
/* -------------------------------------------- */
static getRollData(id) {
return this.rollDataStore[id];
}
/* -------------------------------------------- */
static onSocketMesssage(msg) {
//console.log("SOCKET MESSAGE", msg.name, game.user.character.id, msg.data.defenderId);
if (msg.name == "msg_update_defense_state") {
this.updateDefenseState(msg.data.defenderId, msg.data.rollId);
}
if (msg.name == "msg_update_roll") {
this.updateRollData(msg.data);
if (msg.name == "msg_apply_combativite") {
let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
defender.changeEtatCombativite(msg.data.value)
}
}
@@ -352,7 +363,15 @@ export class HawkmoonUtility {
}
}
/* -------------------------------------------- */
static applyCombativite(rollData, value) {
if (game.user.isGM) {
let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
defender.changeEtatCombativite(value)
} else {
game.socket.emit("system.fvtt-hawkmoon-cyd", { msg: "msg_apply_combativite", data: { defenderTokenId: rollData.defenderTokenId, value } });
}
}
/* -------------------------------------------- */
static async rollHawkmoon(rollData) {
@@ -362,7 +381,10 @@ export class HawkmoonUtility {
}
if (!rollData.attr) {
rollData.actionImg = "systems/fvtt-hawkmoon-cyd/assets/icons/" + actor.system.attributs[rollData.attrKey].labelnorm + ".webp"
rollData.attr = duplicate(actor.system.attributs[rollData.attrKey])
rollData.attr = foundry.utils.duplicate(actor.system.attributs[rollData.attrKey])
}
if (rollData.attrKey2 != "none") {
rollData.attr2 = foundry.utils.duplicate(actor.system.attributs[rollData.attrKey2])
}
if (rollData.maitriseId != "none") {
@@ -374,7 +396,7 @@ export class HawkmoonUtility {
//console.log("BEFORE COMP", rollData)
if (rollData.competence) {
rollData.predilections = duplicate(rollData.competence.system.predilections.filter(pred => pred.acquise && !pred.maitrise && !pred.used) || [])
rollData.predilections = foundry.utils.duplicate(rollData.competence.system.predilections || [])
let compmod = (rollData.competence.system.niveau == 0) ? -3 : 0
rollData.diceFormula += `+${rollData.attr.value}+${rollData.competence.system.niveau}+${rollData.modificateur}+${compmod}`
@@ -396,13 +418,26 @@ export class HawkmoonUtility {
}
}
rollData.diceFormula += `+${rollData.bonusMalusContext}`
} else if (rollData.attr2) {
rollData.diceFormula += `+${rollData.attr.value}+${rollData.attr2.value}+${rollData.modificateur}+${rollData.bonusMalusContext}`
} else {
rollData.diceFormula += `+${rollData.attr.value}*${rollData.multiplier}+${rollData.modificateur}+${rollData.bonusMalusContext}`
}
// Bonus arme naturelle en défense
if (rollData.bonusArmeNaturelle) {
rollData.diceFormula += `+${rollData.bonusArmeNaturelle}`
}
if (rollData.attaquantsMultiples) {
rollData.diceFormula += `+3`
}
if (rollData.hasAmbidextre) {
if ( rollData.attaqueAmbidextre1) {
rollData.diceFormula += `-3`
} else if ( rollData.attaqueAmbidextre2) {
rollData.diceFormula += `-5`
}
}
if (rollData.defenseurAuSol) {
rollData.diceFormula += `+3`
}
@@ -418,6 +453,9 @@ export class HawkmoonUtility {
if (rollData.defenseurImmobilise) {
rollData.diceFormula += `+5`
}
if (rollData.soutiens > 0) { // 1 soutien = +3, 2 soutiens = +4, 3 soutiens = +5
rollData.diceFormula += `+${rollData.soutiens+2}`
}
if (rollData.arme?.system.isDistance) {
rollData.difficulte = __distanceDifficulte[rollData.distanceTir]
@@ -426,6 +464,7 @@ export class HawkmoonUtility {
rollData.difficulte += __tailleCible[rollData.tailleCible]
rollData.difficulte += rollData.cibleDeplace ? 3 : 0
rollData.difficulte += rollData.cibleCaC ? 3 : 0
rollData.difficulte += rollData.protectionDefenseur
}
if (rollData.attaqueDesarme) {
rollData.difficulte += 10
@@ -438,9 +477,12 @@ export class HawkmoonUtility {
rollData.diceFormula += `+${rollData.arme.system.bonusmaniementoff}`
}
let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
// Gestion de la feinte éventuelle
rollData.nbCombativitePerdu = 1
let myRoll = await new Roll(rollData.diceFormula).roll()
await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
rollData.roll = duplicate(myRoll)
rollData.roll = foundry.utils.duplicate(myRoll)
console.log(">>>> ", myRoll)
rollData.finalResult = myRoll.total
@@ -448,20 +490,47 @@ export class HawkmoonUtility {
if (rollData.isInit) {
actor.setFlag("world", "last-initiative", rollData.finalResult)
}
if (rollData.feinte) {
actor.changeBonneAventure(-1)
if ( rollData.isHeroique) {
rollData.nbCombativitePerdu = "vaincu"
} else if ( rollData.isSuccess) {
rollData.nbCombativitePerdu = 2
}
}
this.createChatWithRollMode(rollData.alias, {
content: await renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-generic-result.html`, rollData)
}, rollData)
if ( (rollData.coupBas || rollData.arme) && rollData.isSuccess && rollData.defenderTokenId) {
this.applyCombativite(rollData, rollData.nbCombativitePerdu)
}
if (rollData.coupBas && rollData.isSuccess && rollData.defenderTokenId) {
let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
defender.incDecAdversite("bleue", -2)
}
}
/* -------------------------------------------- */
static getCombativiteList(nbActivite) {
let list = [ { value: String(0), label: "Combatif"}]
for (let i = 1; i < nbActivite-2; i++) {
list.push({ value: String(i), label:"Eprouvé " + i} )
}
list[nbActivite-2] = { value: String(nbActivite-2), label:"Affaibli"}
list[nbActivite-1] = { value: String(nbActivite-1), label:"Très Affaibli"}
list[nbActivite] = { value: String(nbActivite), label:"Vaincu"}
return list
}
/* -------------------------------------------- */
static async bonusRollHawkmoon(rollData) {
rollData.bonusFormula = rollData.addedBonus
let bonusRoll = new Roll(rollData.bonusFormula).roll({ async: false })
let bonusRoll = await new Roll(rollData.bonusFormula).roll()
await this.showDiceSoNice(bonusRoll, game.settings.get("core", "rollMode"));
rollData.bonusRoll = duplicate(bonusRoll)
rollData.bonusRoll = foundry.utils.duplicate(bonusRoll)
rollData.finalResult += rollData.bonusRoll.total
@@ -495,7 +564,7 @@ export class HawkmoonUtility {
/* -------------------------------------------- */
static blindMessageToGM(chatOptions) {
let chatGM = duplicate(chatOptions);
let chatGM = foundry.utils.duplicate(chatOptions);
chatGM.whisper = this.getUsers(user => user.isGM);
chatGM.content = "Blinde message of " + game.user.name + "<br>" + chatOptions.content;
console.log("blindMessageToGM", chatGM);
@@ -559,7 +628,7 @@ export class HawkmoonUtility {
/* -------------------------------------------- */
static getBasicRollData() {
let rollData = {
rollId: randomID(16),
rollId: foundry.utils.randomID(16),
rollMode: game.settings.get("core", "rollMode"),
modificateursOptions: this.getModificateurOptions(),
pointAmeOptions: this.getPointAmeOptions(),
@@ -577,7 +646,12 @@ export class HawkmoonUtility {
cibleCouvert: "aucun",
distanceTir: "porteemoyenne",
attaqueCharge: false,
attaqueDesarme: false
attaqueDesarme: false,
attaqueAmbidextre1 : false,
attaqueAmbidextre2 : false,
chargeCavalerie : false,
contenir : false,
soutiens : 0
}
return rollData
}
@@ -591,9 +665,17 @@ export class HawkmoonUtility {
rollData.armeDefense = defender.getBestDefenseValue()
rollData.targetVigueur = defender.getVigueur()
rollData.protectionDefenseur = defender.getProtection()
if (rollData.armeDefense) {
if (rollData.immobiliser || rollData.repousser) {
let combatValues = defender.getCombatValues()
rollData.difficulte = combatValues.defenseTotal + (rollData.armeDefense && rollData.cibleconsciente ? 5 : 0)
} else if (rollData.coupBas) {
let combatValues = defender.getCombatValues()
rollData.difficulte = combatValues.defenseTotal
}else if ( rollData.assomer) {
rollData.difficulte = 3 + (defender.system.attributs.tre.value * 2)
} else if (rollData.armeDefense) {
rollData.difficulte = rollData.armeDefense.system.totalDefensif
if ( !rollData.arme.system.armenaturelle && !rollData.arme.system.armefortune ){
if ( !rollData.desengager && !rollData.arme.system.armenaturelle && !rollData.arme.system.armefortune ){
if (rollData.armeDefense.system.armenaturelle || rollData.armeDefense.system.armefortune) {
rollData.bonusArmeNaturelle = 3
}
@@ -615,7 +697,7 @@ export class HawkmoonUtility {
let msg = game.messages.get(msgId)
if (msg) {
let rollData = msg.getFlag("world", "hawkmoon-roll")
let actor = this.getActorFromRollData(rollData)
let actor = HawkmoonUtility.getActorFromRollData(rollData)
actor.changeBonneAventure(changed)
rollData.isReroll = true
rollData.textBonus = "Bonus de Points d'Aventure"
@@ -634,7 +716,7 @@ export class HawkmoonUtility {
let msg = game.messages.get(msgId)
if (msg) {
let rollData = msg.getFlag("world", "hawkmoon-roll")
let actor = this.getActorFromRollData(rollData)
let actor = HawkmoonUtility.getActorFromRollData(rollData)
actor.changeEclat(changed)
rollData.isReroll = true
rollData.textBonus = "Bonus d'Eclat"
@@ -653,13 +735,13 @@ export class HawkmoonUtility {
let canApplyBA = function (li) {
let message = game.messages.get(li.attr("data-message-id"))
let rollData = message.getFlag("world", "hawkmoon-roll")
let actor = this.getActorFromRollData(rollData)
let actor = HawkmoonUtility.getActorFromRollData(rollData)
return (!rollData.isReroll && actor.getBonneAventure() > 0)
}
let canApplyPE = function (li) {
let message = game.messages.get(li.attr("data-message-id"))
let rollData = message.getFlag("world", "hawkmoon-roll")
let actor = this.getActorFromRollData(rollData)
let actor = HawkmoonUtility.getActorFromRollData(rollData)
return (!rollData.isReroll && actor.getEclat() > 0)
}
options.push(
@@ -692,11 +774,11 @@ export class HawkmoonUtility {
/* -------------------------------------------- */
static async confirmDelete(actorSheet, li) {
let itemId = li.data("item-id");
let msgTxt = "<p>Are you sure to remove this Item ?";
let msgTxt = "<p>Etes vous certain de vouloir supprimer cet item ?";
let buttons = {
delete: {
icon: '<i class="fas fa-check"></i>',
label: "Yes, remove it",
label: "Oui !",
callback: () => {
actorSheet.actor.deleteEmbeddedDocuments("Item", [itemId]);
li.slideUp(200, () => actorSheet.render(false));
@@ -704,12 +786,12 @@ export class HawkmoonUtility {
},
cancel: {
icon: '<i class="fas fa-times"></i>',
label: "Cancel"
label: "Non"
}
}
msgTxt += "</p>";
let d = new Dialog({
title: "Confirm removal",
title: "Confirmer la suppression",
content: msgTxt,
buttons: buttons,
default: "cancel"
@@ -728,7 +810,6 @@ export class HawkmoonUtility {
console.log(entryData)
htmlTab += `<tr><td>@UUID[Compendium.${compName}.${entryData._id}]{${entryData.name}}</td>`
htmlTab += `<td>${entryData.system.description}</td>`;
//htmlTab += `<td>${entryData.system.resumebonus}</td>`;
htmlTab += "</tr>\n";
}
htmlTab += "</table>";

Binary file not shown.

View File

View File

@@ -0,0 +1 @@
MANIFEST-000222

0
packs/aides-de-jeu/LOCK Normal file
View File

8
packs/aides-de-jeu/LOG Normal file
View File

@@ -0,0 +1,8 @@
2024/06/15-23:28:57.160525 7f479cc006c0 Recovering log #219
2024/06/15-23:28:57.171818 7f479cc006c0 Delete type=3 #217
2024/06/15-23:28:57.171870 7f479cc006c0 Delete type=0 #219
2024/06/15-23:30:57.795030 7f479a4006c0 Level-0 table #225: started
2024/06/15-23:30:57.795056 7f479a4006c0 Level-0 table #225: 0 bytes OK
2024/06/15-23:30:57.850629 7f479a4006c0 Delete type=0 #223
2024/06/15-23:30:57.850776 7f479a4006c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)
2024/06/15-23:30:57.850790 7f479a4006c0 Manual compaction at level-1 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)

View File

@@ -0,0 +1,15 @@
2024/06/15-23:24:42.765938 7f479b8006c0 Recovering log #215
2024/06/15-23:24:42.776438 7f479b8006c0 Delete type=3 #213
2024/06/15-23:24:42.776492 7f479b8006c0 Delete type=0 #215
2024/06/15-23:25:26.495744 7f479a4006c0 Level-0 table #220: started
2024/06/15-23:25:26.500186 7f479a4006c0 Level-0 table #220: 41204 bytes OK
2024/06/15-23:25:26.506315 7f479a4006c0 Delete type=0 #218
2024/06/15-23:25:26.517184 7f479a4006c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)
2024/06/15-23:25:26.529740 7f479a4006c0 Manual compaction at level-1 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 11 : 1
2024/06/15-23:25:26.529746 7f479a4006c0 Compacting 1@1 + 1@2 files
2024/06/15-23:25:26.533740 7f479a4006c0 Generated table #221@1: 4 keys, 41204 bytes
2024/06/15-23:25:26.533758 7f479a4006c0 Compacted 1@1 + 1@2 files => 41204 bytes
2024/06/15-23:25:26.539879 7f479a4006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/06/15-23:25:26.540007 7f479a4006c0 Delete type=2 #164
2024/06/15-23:25:26.540130 7f479a4006c0 Delete type=2 #220
2024/06/15-23:25:26.551592 7f479a4006c0 Manual compaction at level-1 from '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 11 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end)

Binary file not shown.

BIN
packs/armes/000221.ldb Normal file

Binary file not shown.

0
packs/armes/000224.log Normal file
View File

1
packs/armes/CURRENT Normal file
View File

@@ -0,0 +1 @@
MANIFEST-000222

0
packs/armes/LOCK Normal file
View File

8
packs/armes/LOG Normal file
View File

@@ -0,0 +1,8 @@
2024/06/15-23:28:57.056793 7f479c2006c0 Recovering log #219
2024/06/15-23:28:57.067408 7f479c2006c0 Delete type=3 #217
2024/06/15-23:28:57.067481 7f479c2006c0 Delete type=0 #219
2024/06/15-23:30:56.946158 7f479a4006c0 Level-0 table #225: started
2024/06/15-23:30:56.946226 7f479a4006c0 Level-0 table #225: 0 bytes OK
2024/06/15-23:30:57.023329 7f479a4006c0 Delete type=0 #223
2024/06/15-23:30:57.270050 7f479a4006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)
2024/06/15-23:30:57.270076 7f479a4006c0 Manual compaction at level-1 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)

15
packs/armes/LOG.old Normal file
View File

@@ -0,0 +1,15 @@
2024/06/15-23:24:42.647919 7f479cc006c0 Recovering log #215
2024/06/15-23:24:42.658287 7f479cc006c0 Delete type=3 #213
2024/06/15-23:24:42.658374 7f479cc006c0 Delete type=0 #215
2024/06/15-23:25:26.375347 7f479a4006c0 Level-0 table #220: started
2024/06/15-23:25:26.378560 7f479a4006c0 Level-0 table #220: 14080 bytes OK
2024/06/15-23:25:26.384735 7f479a4006c0 Delete type=0 #218
2024/06/15-23:25:26.394725 7f479a4006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)
2024/06/15-23:25:26.414915 7f479a4006c0 Manual compaction at level-1 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at '!items!wxrzP3NyiHiYnAMJ' @ 147 : 1
2024/06/15-23:25:26.414920 7f479a4006c0 Compacting 1@1 + 1@2 files
2024/06/15-23:25:26.418236 7f479a4006c0 Generated table #221@1: 49 keys, 14080 bytes
2024/06/15-23:25:26.418263 7f479a4006c0 Compacted 1@1 + 1@2 files => 14080 bytes
2024/06/15-23:25:26.424226 7f479a4006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/06/15-23:25:26.424323 7f479a4006c0 Delete type=2 #164
2024/06/15-23:25:26.424432 7f479a4006c0 Delete type=2 #220
2024/06/15-23:25:26.435530 7f479a4006c0 Manual compaction at level-1 from '!items!wxrzP3NyiHiYnAMJ' @ 147 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end)

BIN
packs/armes/MANIFEST-000222 Normal file

Binary file not shown.

Binary file not shown.

View File

View File

@@ -0,0 +1 @@
MANIFEST-000222

View File

View File

@@ -0,0 +1,8 @@
2024/06/15-23:28:57.031534 7f479cc006c0 Recovering log #219
2024/06/15-23:28:57.041093 7f479cc006c0 Delete type=3 #217
2024/06/15-23:28:57.041142 7f479cc006c0 Delete type=0 #219
2024/06/15-23:30:56.657491 7f479a4006c0 Level-0 table #225: started
2024/06/15-23:30:56.657545 7f479a4006c0 Level-0 table #225: 0 bytes OK
2024/06/15-23:30:56.729291 7f479a4006c0 Delete type=0 #223
2024/06/15-23:30:56.945946 7f479a4006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)
2024/06/15-23:30:56.946001 7f479a4006c0 Manual compaction at level-1 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)

View File

@@ -0,0 +1,15 @@
2024/06/15-23:24:42.621971 7f479b8006c0 Recovering log #215
2024/06/15-23:24:42.632781 7f479b8006c0 Delete type=3 #213
2024/06/15-23:24:42.632847 7f479b8006c0 Delete type=0 #215
2024/06/15-23:25:26.293519 7f479a4006c0 Level-0 table #220: started
2024/06/15-23:25:26.296877 7f479a4006c0 Level-0 table #220: 7080 bytes OK
2024/06/15-23:25:26.303812 7f479a4006c0 Delete type=0 #218
2024/06/15-23:25:26.314853 7f479a4006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)
2024/06/15-23:25:26.335642 7f479a4006c0 Manual compaction at level-1 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at '!items!tFU5yISK6spdNWco' @ 24 : 1
2024/06/15-23:25:26.335663 7f479a4006c0 Compacting 1@1 + 1@2 files
2024/06/15-23:25:26.338945 7f479a4006c0 Generated table #221@1: 8 keys, 7080 bytes
2024/06/15-23:25:26.338968 7f479a4006c0 Compacted 1@1 + 1@2 files => 7080 bytes
2024/06/15-23:25:26.344833 7f479a4006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/06/15-23:25:26.344929 7f479a4006c0 Delete type=2 #164
2024/06/15-23:25:26.345039 7f479a4006c0 Delete type=2 #220
2024/06/15-23:25:26.356140 7f479a4006c0 Manual compaction at level-1 from '!items!tFU5yISK6spdNWco' @ 24 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end)

Binary file not shown.

Binary file not shown.

View File

View File

@@ -0,0 +1 @@
MANIFEST-000222

0
packs/competences/LOCK Normal file
View File

8
packs/competences/LOG Normal file
View File

@@ -0,0 +1,8 @@
2024/06/15-23:28:57.003981 7f479c2006c0 Recovering log #219
2024/06/15-23:28:57.014420 7f479c2006c0 Delete type=3 #217
2024/06/15-23:28:57.014473 7f479c2006c0 Delete type=0 #219
2024/06/15-23:30:56.876144 7f479a4006c0 Level-0 table #225: started
2024/06/15-23:30:56.876196 7f479a4006c0 Level-0 table #225: 0 bytes OK
2024/06/15-23:30:56.945798 7f479a4006c0 Delete type=0 #223
2024/06/15-23:30:56.945988 7f479a4006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)
2024/06/15-23:30:56.946013 7f479a4006c0 Manual compaction at level-1 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)

15
packs/competences/LOG.old Normal file
View File

@@ -0,0 +1,15 @@
2024/06/15-23:24:42.592284 7f479cc006c0 Recovering log #215
2024/06/15-23:24:42.602371 7f479cc006c0 Delete type=3 #213
2024/06/15-23:24:42.602472 7f479cc006c0 Delete type=0 #215
2024/06/15-23:25:26.283662 7f479a4006c0 Level-0 table #220: started
2024/06/15-23:25:26.286998 7f479a4006c0 Level-0 table #220: 16617 bytes OK
2024/06/15-23:25:26.293338 7f479a4006c0 Delete type=0 #218
2024/06/15-23:25:26.314844 7f479a4006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)
2024/06/15-23:25:26.324985 7f479a4006c0 Manual compaction at level-1 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at '!items!yI1zY5k8mAdx9wHK' @ 45 : 1
2024/06/15-23:25:26.324991 7f479a4006c0 Compacting 1@1 + 1@2 files
2024/06/15-23:25:26.328976 7f479a4006c0 Generated table #221@1: 15 keys, 16617 bytes
2024/06/15-23:25:26.329003 7f479a4006c0 Compacted 1@1 + 1@2 files => 16617 bytes
2024/06/15-23:25:26.335185 7f479a4006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/06/15-23:25:26.335327 7f479a4006c0 Delete type=2 #164
2024/06/15-23:25:26.335523 7f479a4006c0 Delete type=2 #220
2024/06/15-23:25:26.356120 7f479a4006c0 Manual compaction at level-1 from '!items!yI1zY5k8mAdx9wHK' @ 45 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end)

Binary file not shown.

BIN
packs/equipement/000221.ldb Normal file

Binary file not shown.

View File

1
packs/equipement/CURRENT Normal file
View File

@@ -0,0 +1 @@
MANIFEST-000222

0
packs/equipement/LOCK Normal file
View File

8
packs/equipement/LOG Normal file
View File

@@ -0,0 +1,8 @@
2024/06/15-23:28:57.081145 7f479cc006c0 Recovering log #219
2024/06/15-23:28:57.092539 7f479cc006c0 Delete type=3 #217
2024/06/15-23:28:57.092616 7f479cc006c0 Delete type=0 #219
2024/06/15-23:30:57.023529 7f479a4006c0 Level-0 table #225: started
2024/06/15-23:30:57.023569 7f479a4006c0 Level-0 table #225: 0 bytes OK
2024/06/15-23:30:57.097544 7f479a4006c0 Delete type=0 #223
2024/06/15-23:30:57.270060 7f479a4006c0 Manual compaction at level-0 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)
2024/06/15-23:30:57.270101 7f479a4006c0 Manual compaction at level-1 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)

15
packs/equipement/LOG.old Normal file
View File

@@ -0,0 +1,15 @@
2024/06/15-23:24:42.675126 7f479b8006c0 Recovering log #215
2024/06/15-23:24:42.685268 7f479b8006c0 Delete type=3 #213
2024/06/15-23:24:42.685329 7f479b8006c0 Delete type=0 #215
2024/06/15-23:25:26.365494 7f479a4006c0 Level-0 table #220: started
2024/06/15-23:25:26.368781 7f479a4006c0 Level-0 table #220: 32801 bytes OK
2024/06/15-23:25:26.375217 7f479a4006c0 Delete type=0 #218
2024/06/15-23:25:26.394718 7f479a4006c0 Manual compaction at level-0 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)
2024/06/15-23:25:26.404124 7f479a4006c0 Manual compaction at level-1 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at '!items!zYx0Ak2y1LNTcKlO' @ 453 : 1
2024/06/15-23:25:26.404130 7f479a4006c0 Compacting 1@1 + 1@2 files
2024/06/15-23:25:26.408017 7f479a4006c0 Generated table #221@1: 151 keys, 32801 bytes
2024/06/15-23:25:26.408039 7f479a4006c0 Compacted 1@1 + 1@2 files => 32801 bytes
2024/06/15-23:25:26.414631 7f479a4006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/06/15-23:25:26.414726 7f479a4006c0 Delete type=2 #164
2024/06/15-23:25:26.414840 7f479a4006c0 Delete type=2 #220
2024/06/15-23:25:26.424507 7f479a4006c0 Manual compaction at level-1 from '!items!zYx0Ak2y1LNTcKlO' @ 453 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end)

Binary file not shown.

Binary file not shown.

View File

View File

@@ -0,0 +1 @@
MANIFEST-000222

0
packs/historiques/LOCK Normal file
View File

8
packs/historiques/LOG Normal file
View File

@@ -0,0 +1,8 @@
2024/06/15-23:28:57.043886 7f479d6006c0 Recovering log #219
2024/06/15-23:28:57.054533 7f479d6006c0 Delete type=3 #217
2024/06/15-23:28:57.054591 7f479d6006c0 Delete type=0 #219
2024/06/15-23:30:56.729405 7f479a4006c0 Level-0 table #225: started
2024/06/15-23:30:56.729427 7f479a4006c0 Level-0 table #225: 0 bytes OK
2024/06/15-23:30:56.800493 7f479a4006c0 Delete type=0 #223
2024/06/15-23:30:56.945957 7f479a4006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)
2024/06/15-23:30:56.945995 7f479a4006c0 Manual compaction at level-1 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)

15
packs/historiques/LOG.old Normal file
View File

@@ -0,0 +1,15 @@
2024/06/15-23:24:42.635253 7f479c2006c0 Recovering log #215
2024/06/15-23:24:42.645121 7f479c2006c0 Delete type=3 #213
2024/06/15-23:24:42.645182 7f479c2006c0 Delete type=0 #215
2024/06/15-23:25:26.303948 7f479a4006c0 Level-0 table #220: started
2024/06/15-23:25:26.308108 7f479a4006c0 Level-0 table #220: 19910 bytes OK
2024/06/15-23:25:26.314670 7f479a4006c0 Delete type=0 #218
2024/06/15-23:25:26.314861 7f479a4006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)
2024/06/15-23:25:26.345096 7f479a4006c0 Manual compaction at level-1 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at '!items!z1HtkvazCGHut7cz' @ 144 : 1
2024/06/15-23:25:26.345106 7f479a4006c0 Compacting 1@1 + 1@2 files
2024/06/15-23:25:26.348628 7f479a4006c0 Generated table #221@1: 48 keys, 19910 bytes
2024/06/15-23:25:26.348654 7f479a4006c0 Compacted 1@1 + 1@2 files => 19910 bytes
2024/06/15-23:25:26.355550 7f479a4006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/06/15-23:25:26.355724 7f479a4006c0 Delete type=2 #164
2024/06/15-23:25:26.355949 7f479a4006c0 Delete type=2 #220
2024/06/15-23:25:26.356178 7f479a4006c0 Manual compaction at level-1 from '!items!z1HtkvazCGHut7cz' @ 144 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end)

Binary file not shown.

BIN
packs/mutations/000131.ldb Normal file

Binary file not shown.

View File

1
packs/mutations/CURRENT Normal file
View File

@@ -0,0 +1 @@
MANIFEST-000132

0
packs/mutations/LOCK Normal file
View File

8
packs/mutations/LOG Normal file
View File

@@ -0,0 +1,8 @@
2024/06/15-23:28:57.017180 7f479b8006c0 Recovering log #129
2024/06/15-23:28:57.028451 7f479b8006c0 Delete type=3 #127
2024/06/15-23:28:57.028607 7f479b8006c0 Delete type=0 #129
2024/06/15-23:30:56.800624 7f479a4006c0 Level-0 table #135: started
2024/06/15-23:30:56.800652 7f479a4006c0 Level-0 table #135: 0 bytes OK
2024/06/15-23:30:56.875914 7f479a4006c0 Delete type=0 #133
2024/06/15-23:30:56.945968 7f479a4006c0 Manual compaction at level-0 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)
2024/06/15-23:30:56.946007 7f479a4006c0 Manual compaction at level-1 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)

15
packs/mutations/LOG.old Normal file
View File

@@ -0,0 +1,15 @@
2024/06/15-23:24:42.606933 7f479d6006c0 Recovering log #125
2024/06/15-23:24:42.618215 7f479d6006c0 Delete type=3 #123
2024/06/15-23:24:42.618277 7f479d6006c0 Delete type=0 #125
2024/06/15-23:25:26.272981 7f479a4006c0 Level-0 table #130: started
2024/06/15-23:25:26.276630 7f479a4006c0 Level-0 table #130: 58473 bytes OK
2024/06/15-23:25:26.283532 7f479a4006c0 Delete type=0 #128
2024/06/15-23:25:26.314830 7f479a4006c0 Manual compaction at level-0 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)
2024/06/15-23:25:26.314872 7f479a4006c0 Manual compaction at level-1 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at '!items!zttESycGKltfwCzJ' @ 493 : 1
2024/06/15-23:25:26.314876 7f479a4006c0 Compacting 1@1 + 1@2 files
2024/06/15-23:25:26.318892 7f479a4006c0 Generated table #131@1: 167 keys, 59188 bytes
2024/06/15-23:25:26.318906 7f479a4006c0 Compacted 1@1 + 1@2 files => 59188 bytes
2024/06/15-23:25:26.324686 7f479a4006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/06/15-23:25:26.324793 7f479a4006c0 Delete type=2 #74
2024/06/15-23:25:26.324924 7f479a4006c0 Delete type=2 #130
2024/06/15-23:25:26.356097 7f479a4006c0 Manual compaction at level-1 from '!items!zttESycGKltfwCzJ' @ 493 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end)

Binary file not shown.

BIN
packs/profils/000221.ldb Normal file

Binary file not shown.

0
packs/profils/000224.log Normal file
View File

1
packs/profils/CURRENT Normal file
View File

@@ -0,0 +1 @@
MANIFEST-000222

0
packs/profils/LOCK Normal file
View File

8
packs/profils/LOG Normal file
View File

@@ -0,0 +1,8 @@
2024/06/15-23:28:57.095745 7f479d6006c0 Recovering log #219
2024/06/15-23:28:57.105942 7f479d6006c0 Delete type=3 #217
2024/06/15-23:28:57.105994 7f479d6006c0 Delete type=0 #219
2024/06/15-23:30:57.182099 7f479a4006c0 Level-0 table #225: started
2024/06/15-23:30:57.182178 7f479a4006c0 Level-0 table #225: 0 bytes OK
2024/06/15-23:30:57.269856 7f479a4006c0 Delete type=0 #223
2024/06/15-23:30:57.270086 7f479a4006c0 Manual compaction at level-0 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)
2024/06/15-23:30:57.270118 7f479a4006c0 Manual compaction at level-1 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)

15
packs/profils/LOG.old Normal file
View File

@@ -0,0 +1,15 @@
2024/06/15-23:24:42.689474 7f479c2006c0 Recovering log #215
2024/06/15-23:24:42.699972 7f479c2006c0 Delete type=3 #213
2024/06/15-23:24:42.700056 7f479c2006c0 Delete type=0 #215
2024/06/15-23:25:26.384925 7f479a4006c0 Level-0 table #220: started
2024/06/15-23:25:26.388287 7f479a4006c0 Level-0 table #220: 29908 bytes OK
2024/06/15-23:25:26.394580 7f479a4006c0 Delete type=0 #218
2024/06/15-23:25:26.414903 7f479a4006c0 Manual compaction at level-0 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)
2024/06/15-23:25:26.424518 7f479a4006c0 Manual compaction at level-1 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at '!items!tFQqcxmkS3MT6ASE' @ 45 : 1
2024/06/15-23:25:26.424523 7f479a4006c0 Compacting 1@1 + 1@2 files
2024/06/15-23:25:26.428339 7f479a4006c0 Generated table #221@1: 15 keys, 29908 bytes
2024/06/15-23:25:26.428375 7f479a4006c0 Compacted 1@1 + 1@2 files => 29908 bytes
2024/06/15-23:25:26.435132 7f479a4006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/06/15-23:25:26.435244 7f479a4006c0 Delete type=2 #164
2024/06/15-23:25:26.435402 7f479a4006c0 Delete type=2 #220
2024/06/15-23:25:26.456764 7f479a4006c0 Manual compaction at level-1 from '!items!tFQqcxmkS3MT6ASE' @ 45 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end)

Binary file not shown.

Binary file not shown.

View File

View File

@@ -0,0 +1 @@
MANIFEST-000222

0
packs/protections/LOCK Normal file
View File

8
packs/protections/LOG Normal file
View File

@@ -0,0 +1,8 @@
2024/06/15-23:28:57.069648 7f479b8006c0 Recovering log #219
2024/06/15-23:28:57.079442 7f479b8006c0 Delete type=3 #217
2024/06/15-23:28:57.079492 7f479b8006c0 Delete type=0 #219
2024/06/15-23:30:57.097765 7f479a4006c0 Level-0 table #225: started
2024/06/15-23:30:57.097817 7f479a4006c0 Level-0 table #225: 0 bytes OK
2024/06/15-23:30:57.181802 7f479a4006c0 Delete type=0 #223
2024/06/15-23:30:57.270069 7f479a4006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)
2024/06/15-23:30:57.270095 7f479a4006c0 Manual compaction at level-1 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)

15
packs/protections/LOG.old Normal file
View File

@@ -0,0 +1,15 @@
2024/06/15-23:24:42.662358 7f479d6006c0 Recovering log #215
2024/06/15-23:24:42.672791 7f479d6006c0 Delete type=3 #213
2024/06/15-23:24:42.672850 7f479d6006c0 Delete type=0 #215
2024/06/15-23:25:26.356239 7f479a4006c0 Level-0 table #220: started
2024/06/15-23:25:26.359444 7f479a4006c0 Level-0 table #220: 3453 bytes OK
2024/06/15-23:25:26.365376 7f479a4006c0 Delete type=0 #218
2024/06/15-23:25:26.394708 7f479a4006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)
2024/06/15-23:25:26.394736 7f479a4006c0 Manual compaction at level-1 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at '!items!yszkersMTE4p9VzP' @ 42 : 1
2024/06/15-23:25:26.394740 7f479a4006c0 Compacting 1@1 + 1@2 files
2024/06/15-23:25:26.397949 7f479a4006c0 Generated table #221@1: 14 keys, 3453 bytes
2024/06/15-23:25:26.397972 7f479a4006c0 Compacted 1@1 + 1@2 files => 3453 bytes
2024/06/15-23:25:26.403819 7f479a4006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/06/15-23:25:26.403930 7f479a4006c0 Delete type=2 #164
2024/06/15-23:25:26.404057 7f479a4006c0 Delete type=2 #220
2024/06/15-23:25:26.424497 7f479a4006c0 Manual compaction at level-1 from '!items!yszkersMTE4p9VzP' @ 42 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end)

Binary file not shown.

0
packs/scenes/000060.log Normal file
View File

BIN
packs/scenes/000062.ldb Normal file

Binary file not shown.

1
packs/scenes/CURRENT Normal file
View File

@@ -0,0 +1 @@
MANIFEST-000058

0
packs/scenes/LOCK Normal file
View File

15
packs/scenes/LOG Normal file
View File

@@ -0,0 +1,15 @@
2024/06/15-23:28:57.147092 7f479d6006c0 Recovering log #55
2024/06/15-23:28:57.157384 7f479d6006c0 Delete type=3 #53
2024/06/15-23:28:57.157442 7f479d6006c0 Delete type=0 #55
2024/06/15-23:30:57.528260 7f479a4006c0 Level-0 table #61: started
2024/06/15-23:30:57.558300 7f479a4006c0 Level-0 table #61: 1600 bytes OK
2024/06/15-23:30:57.598268 7f479a4006c0 Delete type=0 #59
2024/06/15-23:30:57.598442 7f479a4006c0 Manual compaction at level-0 from '!scenes!CXx90Qk7nXEd2uTh' @ 72057594037927935 : 1 .. '!scenes.tokens.delta!CXx90Qk7nXEd2uTh.CNEJkNtOKi9pF1RF.JWM7P6qyhe2EKEzg' @ 0 : 0; will stop at (end)
2024/06/15-23:30:57.598468 7f479a4006c0 Manual compaction at level-1 from '!scenes!CXx90Qk7nXEd2uTh' @ 72057594037927935 : 1 .. '!scenes.tokens.delta!CXx90Qk7nXEd2uTh.CNEJkNtOKi9pF1RF.JWM7P6qyhe2EKEzg' @ 0 : 0; will stop at '!scenes.tokens.delta.items!j6RYn1X7KfhTioX5.FPPNsxboEnoqyAoh.JxMmMrhEE67GWHQD.t9lh152OxZDg41sm' @ 79 : 0
2024/06/15-23:30:57.598473 7f479a4006c0 Compacting 1@1 + 1@2 files
2024/06/15-23:30:57.616745 7f479a4006c0 Generated table #62@1: 6 keys, 3636 bytes
2024/06/15-23:30:57.616786 7f479a4006c0 Compacted 1@1 + 1@2 files => 3636 bytes
2024/06/15-23:30:57.653796 7f479a4006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/06/15-23:30:57.654026 7f479a4006c0 Delete type=2 #57
2024/06/15-23:30:57.654306 7f479a4006c0 Delete type=2 #61
2024/06/15-23:30:57.850750 7f479a4006c0 Manual compaction at level-1 from '!scenes.tokens.delta.items!j6RYn1X7KfhTioX5.FPPNsxboEnoqyAoh.JxMmMrhEE67GWHQD.t9lh152OxZDg41sm' @ 79 : 0 .. '!scenes.tokens.delta!CXx90Qk7nXEd2uTh.CNEJkNtOKi9pF1RF.JWM7P6qyhe2EKEzg' @ 0 : 0; will stop at (end)

15
packs/scenes/LOG.old Normal file
View File

@@ -0,0 +1,15 @@
2024/06/15-23:24:42.749967 7f479c2006c0 Recovering log #51
2024/06/15-23:24:42.759637 7f479c2006c0 Delete type=3 #49
2024/06/15-23:24:42.759691 7f479c2006c0 Delete type=0 #51
2024/06/15-23:25:26.463452 7f479a4006c0 Level-0 table #56: started
2024/06/15-23:25:26.466804 7f479a4006c0 Level-0 table #56: 5102 bytes OK
2024/06/15-23:25:26.472985 7f479a4006c0 Delete type=0 #54
2024/06/15-23:25:26.495730 7f479a4006c0 Manual compaction at level-0 from '!scenes!CXx90Qk7nXEd2uTh' @ 72057594037927935 : 1 .. '!scenes.tokens.delta.items!j6RYn1X7KfhTioX5.FPPNsxboEnoqyAoh.JxMmMrhEE67GWHQD.t9lh152OxZDg41sm' @ 0 : 0; will stop at (end)
2024/06/15-23:25:26.506528 7f479a4006c0 Manual compaction at level-1 from '!scenes!CXx90Qk7nXEd2uTh' @ 72057594037927935 : 1 .. '!scenes.tokens.delta.items!j6RYn1X7KfhTioX5.FPPNsxboEnoqyAoh.JxMmMrhEE67GWHQD.t9lh152OxZDg41sm' @ 0 : 0; will stop at '!scenes.tokens.delta.items!j6RYn1X7KfhTioX5.FPPNsxboEnoqyAoh.JxMmMrhEE67GWHQD.t9lh152OxZDg41sm' @ 71 : 1
2024/06/15-23:25:26.506541 7f479a4006c0 Compacting 1@1 + 1@2 files
2024/06/15-23:25:26.509985 7f479a4006c0 Generated table #57@1: 13 keys, 5102 bytes
2024/06/15-23:25:26.510005 7f479a4006c0 Compacted 1@1 + 1@2 files => 5102 bytes
2024/06/15-23:25:26.516877 7f479a4006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2024/06/15-23:25:26.516977 7f479a4006c0 Delete type=2 #24
2024/06/15-23:25:26.517114 7f479a4006c0 Delete type=2 #56
2024/06/15-23:25:26.529719 7f479a4006c0 Manual compaction at level-1 from '!scenes.tokens.delta.items!j6RYn1X7KfhTioX5.FPPNsxboEnoqyAoh.JxMmMrhEE67GWHQD.t9lh152OxZDg41sm' @ 71 : 1 .. '!scenes.tokens.delta.items!j6RYn1X7KfhTioX5.FPPNsxboEnoqyAoh.JxMmMrhEE67GWHQD.t9lh152OxZDg41sm' @ 0 : 0; will stop at (end)

Some files were not shown because too many files have changed in this diff Show More