Skip to content

Commit 7236102

Browse files
authored
Merge pull request #89 from Cussa/master
fixes for v10
2 parents 37ba8e3 + 5c25084 commit 7236102

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

Diff for: script/sheet/player.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,12 @@ export class PlayerCharacterSheet extends VaesenActorSheet {
309309
icon: statusEffect.icon,
310310
changes: statusEffect.changes,
311311
id: this.uuid,
312-
statuses: statusEffect.statuses
312+
statuses: statusEffect.statuses,
313+
flags: {
314+
core:{
315+
statusId: statusEffect.id
316+
}
317+
},
313318
}]);
314319
}
315320
}

Diff for: script/util/conditions.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ export class conditions{
137137

138138
static async onVaesenCondition(actor, conditionId) {
139139
let condition = Array.from(actor.items?.values()).find(x => x.type == "condition" && x.id == conditionId);
140-
console.log(condition);
141140

142141
await actor.updateEmbeddedDocuments("Item", [
143142
{ _id: condition.id, "data.active": !condition.system.active },
@@ -147,7 +146,12 @@ export class conditions{
147146
label: condition.name,
148147
icon: condition.img,
149148
id: condition.name,
150-
statuses: [condition.name]
149+
statuses: [condition.name],
150+
flags: {
151+
core: {
152+
statusId: condition.name
153+
}
154+
}
151155
};
152156

153157
const currentEffect = Array.from(actor.effects?.values()).find(it => it.icon === statusEffect.icon);

Diff for: script/util/migrator.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ const migrations = {
1919
async function migrateTo4_0() {
2020
const options = {permanent: true};
2121
ui.notifications.warn("Migrating your data to version 4.0.0. Please, wait until it finishes.", options);
22-
console.log("MIGRATING TO 4.0.0");
2322
for (let actor of game.actors.contents) {
2423
const updateData = migrateTo4_0_Actor(actor);
2524
if (!foundry.utils.isEmpty(updateData)) {
@@ -49,7 +48,7 @@ function migrateTo4_0_Actor(actor){
4948
if (!checked)
5049
continue;
5150

52-
const currentEffect = Array.from(actor.effects?.values()).find(it => it.statuses.has(condition.id));
51+
const currentEffect = Array.from(actor.effects?.values()).find(it => it.icon === condition.icon);
5352
if (currentEffect)
5453
continue;
5554

@@ -61,7 +60,12 @@ function migrateTo4_0_Actor(actor){
6160
icon: statusEffect.icon,
6261
changes: statusEffect.changes,
6362
id: actor.uuid,
64-
statuses: statusEffect.statuses
63+
statuses: statusEffect.statuses,
64+
flags: {
65+
core: {
66+
statusId: condition.id
67+
}
68+
}
6569
}]);
6670
}
6771
const actorLink = get(actor, "prototypeToken.actorLink");

Diff for: script/util/token.js

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export class VaesenTokenHUD extends TokenHUD {
1010

1111
if (actor.type === "player") {
1212
let ret = super._getStatusEffectChoices();
13-
console.log(ret);
1413
return ret;
1514
}
1615

@@ -43,7 +42,6 @@ export class VaesenTokenHUD extends TokenHUD {
4342
if (item.type !== "condition") {
4443
continue;
4544
}
46-
console.log(item);
4745
vaesenActions[item.img] = {
4846
cssClass: item.system.active ? "active" : "",
4947
id: item.id,

0 commit comments

Comments
 (0)