public/foundryvtt-reve-de-dragon
1
1
Fork 1
Code Issues 4 Pull Requests Actions Projects Releases 163 Wiki Activity

11.2.21 - Le questionnement d'Akarlikarlikar #699

Merged
uberwald merged 6 commits from VincentVk/foundryvtt-reve-de-dragon:v11 into v11 2024-05-27 07:17:11 +02:00
Conversation 0 Commits 6 Files Changed 20 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 26e8853a94 - Show all commits

2
module/item.js
View File

@ -177,7 +177,7 @@ export class RdDItem extends Item {
constructor(docData, context = {}) { constructor(docData, context = {}) {
if (!context.rdd?.ready) { if (!context.rdd?.ready) {
mergeObject(context, { rdd: { ready: true } }); foundry.utils.mergeObject(context, { rdd: { ready: true } });
const ItemConstructor = game.system.rdd.itemClasses[docData.type]; const ItemConstructor = game.system.rdd.itemClasses[docData.type];
if (ItemConstructor) { if (ItemConstructor) {
if (!docData.img) { if (!docData.img) {

4
module/settings/status-effects.js
View File

@ -65,7 +65,7 @@ export class StatusEffects extends FormApplication {
static valeurSurprise(effect, isCombat) { static valeurSurprise(effect, isCombat) {
if (statusSurpriseTotale.intersects(effect.statuses)) { if (statusSurpriseTotale.intersects(effect.statuses)) {
return 2; return 2
} }
if (statusDemiSurprise.intersects(effect.statuses)) { if (statusDemiSurprise.intersects(effect.statuses)) {
return 1 return 1
@ -110,7 +110,7 @@ export class StatusEffects extends FormApplication {
static get defaultOptions() { static get defaultOptions() {
const options = super.defaultOptions; const options = super.defaultOptions;
mergeObject(options, { foundry.utils.mergeObject(options, {
id: "status-effects", id: "status-effects",
template: "systems/foundryvtt-reve-de-dragon/templates/settings/status-effects.html", template: "systems/foundryvtt-reve-de-dragon/templates/settings/status-effects.html",
height: 800, height: 800,