Skip to content

Commit

Permalink
DND5E system 1.2.3 release
Browse files Browse the repository at this point in the history
  • Loading branch information
aaclayton committed Jan 19, 2021
1 parent 5084073 commit b0209a2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions module/actor/entity.js
Original file line number Diff line number Diff line change
Expand Up @@ -1247,10 +1247,10 @@ export default class Actor5e extends Actor {
}

// Get the original Actor data and the new source data
const o = this.toJSON();
const o = duplicate(this.toJSON());
o.flags.dnd5e = o.flags.dnd5e || {};
o.flags.dnd5e.transformOptions = {mergeSkills, mergeSaves};
const source = target.toJSON();
const source = duplicate(target.toJSON());

// Prepare new data to merge from the source
const d = {
Expand Down
5 changes: 5 additions & 0 deletions module/actor/sheets/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,11 @@ export default class ActorSheet5e extends ActorSheet {
itemData = scroll.data;
}

// Ignore certain statuses
if ( itemData.data ) {
["attunement", "equipped", "proficient", "prepared"].forEach(k => delete itemData.data[k]);
}

// Create the owned item as normal
return super._onDropItemCreate(itemData);
}
Expand Down
4 changes: 2 additions & 2 deletions system.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "dnd5e",
"title": "DnD5e - Fifth Edition System",
"description": "A system for playing the fifth edition of the worlds most popular role-playing game in the Foundry Virtual Tabletop environment.",
"version": "1.2.2",
"version": "1.2.3",
"author": "Atropos",
"scripts": [],
"esmodules": ["dnd5e.js"],
Expand Down Expand Up @@ -95,5 +95,5 @@
"compatibleCoreVersion": "0.7.9",
"url": "https://gitlab.com/foundrynet/dnd5e",
"manifest": "https://gitlab.com/foundrynet/dnd5e/raw/master/system.json",
"download": "https://gitlab.com/foundrynet/dnd5e/-/archive/release-1.2.2/dnd5e-release-1.2.2.zip"
"download": "https://gitlab.com/foundrynet/dnd5e/-/archive/release-1.2.3/dnd5e-release-1.2.3.zip"
}

0 comments on commit b0209a2

Please sign in to comment.