v11.0.21 - les automatismes de Khrachtchoum le Problémeux #668

Merged
uberwald merged 2 commits from VincentVk/foundryvtt-reve-de-dragon:v11 into v11 2023-10-18 21:17:04 +02:00
3 changed files with 48 additions and 28 deletions

View File

@ -1,4 +1,12 @@
# v11.0
## v11.0.21
- Macro pour attaquer avec les compétences de créatures
## v11.0.20
- Macro pour attaquer avec les armes des personnages
## v11.0.17
- Fix: les actions de commerce ne s'appliquait pas bien aux personnages des tokens non liés
## v11.0.15 - L'apprentissage de Khrachtchoum
- Fix: l'expérience ne s'appliquait plus sur certaines réussites particulières (régression depuis la 11.0.7)

View File

@ -1,3 +1,4 @@
import { TYPES } from "./item.js";
export class RdDHotbar {
@ -16,7 +17,10 @@ export class RdDHotbar {
}
static async addToHotbar(item, slot) {
if (item?.type == "arme") { // Used to manage weapons with multiple skills
switch (item?.type ?? "") {
case TYPES.arme:
{
// Les armes peuvent avoir plusieurs usages
if (item.system.competence != "") {
await this.createItemMacro(item, slot, "competence")
slot++
@ -29,8 +33,13 @@ export class RdDHotbar {
await this.createItemMacro(item, slot, "lancer")
slot++
}
} else {
}
return
case TYPES.competence:
case TYPES.competencecreature:
default:
await this.createItemMacro(item, slot)
return
}
}
@ -46,17 +55,17 @@ export class RdDHotbar {
// Create item macro if rollable item - weapon, spell, prayer, trait, or skill
if (documentData.type == "Item") {
let item = fromUuidSync(documentData.uuid)
if (item == undefined) {
item = this.actor.items.get(documentData.uuid)
}
const item = fromUuidSync(documentData.uuid) ?? this.actor.items.get(documentData.uuid)
console.log("DROP", documentData, item)
if (!item || (item.type != "arme" && item.type != "competence")) {
return true
}
switch (item?.type ?? "")
{
case TYPES.arme:
case TYPES.competence:
case TYPES.competencecreature:
this.addToHotbar(item, slot)
return false
}
}
return true
})
@ -68,7 +77,9 @@ export class RdDHotbar {
let actor;
if (speaker.token) actor = game.actors.tokens[speaker.token];
if (!actor) actor = game.actors.get(speaker.actor);
if (!actor) {
return ui.notifications.warn(`Impossible de trouver le personnage concerné`);
}
let item = actor?.items.find(it => it.name === itemName && it.type == itemType) ?? undefined;
if (!item) {
return ui.notifications.warn(`Impossible de trouver l'objet de cette macro`);
@ -76,9 +87,10 @@ export class RdDHotbar {
// Trigger the item roll
switch (item.type) {
case "arme":
case TYPES.arme:
return actor.rollArme(item, competenceName);
case "competence":
case TYPES.competence:
case TYPES.competencecreature:
return actor.rollCompetence(itemName);
}
}

View File

@ -1,8 +1,8 @@
{
"id": "foundryvtt-reve-de-dragon",
"title": "Rêve de Dragon",
"version": "11.0.20",
"download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.0.20.zip",
"version": "11.0.21",
"download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.0.21.zip",
"manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v11/system.json",
"changelog": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/branch/v11/changelog.md",
"compatibility": {