dragonleo/foundry-sw5e
1
0
Fork 0
forked from GitHub-Mirrors/foundry-sw5e
Code Issues Pull requests Projects Releases Wiki Activity

Spot the link / entityClass error!

Browse source
This commit is contained in:
Professor Bunbury 2020-10-23 12:36:42 -04:00
parent 441342b7e9
commit de52576408
53 changed files with 6102 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

16
module/item/entity.js
View file

@ -162,7 +162,23 @@ export class Item5e extends Item {
// Species Items
else if ( itemData.type === "species" ) {
<<<<<<< Updated upstream
labels.species = C.species[data.species];
=======
// labels.species = C.species[data.species];
}
// Archetype Items
else if ( itemData.type === "archetype" ) {
// labels.archetype = C.archetype[data.archetype];
}
// Background Items
else if ( itemData.type === "background" ) {
}
// Class Feature Items
else if ( itemData.type === "classfeature" ) {
>>>>>>> Stashed changes
}
// Equipment Items