diff --git a/README.md b/README.md index 55d2d48..31b14c3 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,9 @@ This project is free and open source, but if you're feeling generous and would l ## Change Log +### [1.1.4] - 2024-06-28 +- Fixed disappearing equipment bug introduced from last version's cleanup + ### [1.1.3] - 2024-05-27 - Minor fixes for Foundry v12 compatibililty - Addressed usage of some older methods that will be phased out in future Foundry versions diff --git a/module/ezitem.js b/module/ezitem.js index 3e6d462..322234e 100644 --- a/module/ezitem.js +++ b/module/ezitem.js @@ -27,11 +27,8 @@ export default class EZItem extends Item { await super._preUpdate(changed, options, userId); if (foundry.utils.hasProperty(changed.system, "equipmenttype")) { - console.warn(changed); const splitArray = changed.system["equipmenttype"].toLowerCase().split("."); - console.warn(splitArray[0]); const img = EZD6.EquipmentTypeImages[splitArray[0]]; - console.warn(img); changed.img = img; } } diff --git a/module/sheets/EZD6CharacterSheet.js b/module/sheets/EZD6CharacterSheet.js index 9f4dee1..f2f8fe4 100644 --- a/module/sheets/EZD6CharacterSheet.js +++ b/module/sheets/EZD6CharacterSheet.js @@ -104,23 +104,26 @@ export default class EZD6CharacterSheet extends ActorSheet { } if (i.type === 'equipment') { - switch (i.system["equipmenttype"]) { - case 'EQUIPMENT.Gear': + // workaround for selectOptions injecting short name instead of long name previously used + let x = i.system["equipmenttype"].split('.'); + let eqType = x[x.length-1].toLowerCase(); + switch (eqType) { + case 'gear': equipment_gear.push(i); break; - case 'EQUIPMENT.Weapon': + case 'weapon': equipment_weapons.push(i); break; - case 'EQUIPMENT.Scroll': + case 'scroll': equipment_scrolls.push(i); break; - case 'EQUIPMENT.Potion': + case 'potion': equipment_potions.push(i); break; - case 'EQUIPMENT.Magic': + case 'magic': equipment_magic.push(i); break; - case 'EQUIPMENT.Other': + case 'other': equipment_other.push(i); break; } diff --git a/packs/ezd6-system-macros/000081.log b/packs/ezd6-system-macros/000085.log similarity index 100% rename from packs/ezd6-system-macros/000081.log rename to packs/ezd6-system-macros/000085.log diff --git a/packs/ezd6-system-macros/CURRENT b/packs/ezd6-system-macros/CURRENT index dad8bc0..011e5ad 100644 --- a/packs/ezd6-system-macros/CURRENT +++ b/packs/ezd6-system-macros/CURRENT @@ -1 +1 @@ -MANIFEST-000079 +MANIFEST-000083 diff --git a/packs/ezd6-system-macros/LOG b/packs/ezd6-system-macros/LOG index 9e4daf7..41ca840 100644 --- a/packs/ezd6-system-macros/LOG +++ b/packs/ezd6-system-macros/LOG @@ -1,8 +1,8 @@ -2024/05/27-15:42:09.841064 b3bff400 Recovering log #77 -2024/05/27-15:42:09.846927 b3bff400 Delete type=0 #77 -2024/05/27-15:42:09.847027 b3bff400 Delete type=3 #75 -2024/05/27-15:43:45.458415 af5ff400 Level-0 table #82: started -2024/05/27-15:43:45.458506 af5ff400 Level-0 table #82: 0 bytes OK -2024/05/27-15:43:45.461113 af5ff400 Delete type=0 #80 -2024/05/27-15:43:45.469396 af5ff400 Manual compaction at level-0 from '!macros!6GSdLhN1nG8XNnDZ' @ 72057594037927935 : 1 .. '!macros!zD81BcFzbzxVRKgE' @ 0 : 0; will stop at (end) -2024/05/27-15:43:45.469521 af5ff400 Manual compaction at level-1 from '!macros!6GSdLhN1nG8XNnDZ' @ 72057594037927935 : 1 .. '!macros!zD81BcFzbzxVRKgE' @ 0 : 0; will stop at (end) +2024/06/27-19:09:21.609021 b3bff400 Recovering log #81 +2024/06/27-19:09:21.615312 b3bff400 Delete type=3 #79 +2024/06/27-19:09:21.615444 b3bff400 Delete type=0 #81 +2024/06/28-15:26:14.102409 b04ff400 Level-0 table #86: started +2024/06/28-15:26:14.102545 b04ff400 Level-0 table #86: 0 bytes OK +2024/06/28-15:26:14.105704 b04ff400 Delete type=0 #84 +2024/06/28-15:26:14.138015 b04ff400 Manual compaction at level-0 from '!macros!6GSdLhN1nG8XNnDZ' @ 72057594037927935 : 1 .. '!macros!zD81BcFzbzxVRKgE' @ 0 : 0; will stop at (end) +2024/06/28-15:26:14.158939 b04ff400 Manual compaction at level-1 from '!macros!6GSdLhN1nG8XNnDZ' @ 72057594037927935 : 1 .. '!macros!zD81BcFzbzxVRKgE' @ 0 : 0; will stop at (end) diff --git a/packs/ezd6-system-macros/LOG.old b/packs/ezd6-system-macros/LOG.old index ef8475e..9e4daf7 100644 --- a/packs/ezd6-system-macros/LOG.old +++ b/packs/ezd6-system-macros/LOG.old @@ -1,8 +1,8 @@ -2024/05/27-00:40:09.023517 b33fe400 Recovering log #73 -2024/05/27-00:40:09.029586 b33fe400 Delete type=0 #73 -2024/05/27-00:40:09.029686 b33fe400 Delete type=3 #71 -2024/05/27-15:40:34.594395 af5ff400 Level-0 table #78: started -2024/05/27-15:40:34.594452 af5ff400 Level-0 table #78: 0 bytes OK -2024/05/27-15:40:34.596854 af5ff400 Delete type=0 #76 -2024/05/27-15:40:34.597091 af5ff400 Manual compaction at level-0 from '!macros!6GSdLhN1nG8XNnDZ' @ 72057594037927935 : 1 .. '!macros!zD81BcFzbzxVRKgE' @ 0 : 0; will stop at (end) -2024/05/27-15:40:34.597189 af5ff400 Manual compaction at level-1 from '!macros!6GSdLhN1nG8XNnDZ' @ 72057594037927935 : 1 .. '!macros!zD81BcFzbzxVRKgE' @ 0 : 0; will stop at (end) +2024/05/27-15:42:09.841064 b3bff400 Recovering log #77 +2024/05/27-15:42:09.846927 b3bff400 Delete type=0 #77 +2024/05/27-15:42:09.847027 b3bff400 Delete type=3 #75 +2024/05/27-15:43:45.458415 af5ff400 Level-0 table #82: started +2024/05/27-15:43:45.458506 af5ff400 Level-0 table #82: 0 bytes OK +2024/05/27-15:43:45.461113 af5ff400 Delete type=0 #80 +2024/05/27-15:43:45.469396 af5ff400 Manual compaction at level-0 from '!macros!6GSdLhN1nG8XNnDZ' @ 72057594037927935 : 1 .. '!macros!zD81BcFzbzxVRKgE' @ 0 : 0; will stop at (end) +2024/05/27-15:43:45.469521 af5ff400 Manual compaction at level-1 from '!macros!6GSdLhN1nG8XNnDZ' @ 72057594037927935 : 1 .. '!macros!zD81BcFzbzxVRKgE' @ 0 : 0; will stop at (end) diff --git a/packs/ezd6-system-macros/MANIFEST-000079 b/packs/ezd6-system-macros/MANIFEST-000083 similarity index 74% rename from packs/ezd6-system-macros/MANIFEST-000079 rename to packs/ezd6-system-macros/MANIFEST-000083 index eba53c7..29d4d91 100644 Binary files a/packs/ezd6-system-macros/MANIFEST-000079 and b/packs/ezd6-system-macros/MANIFEST-000083 differ diff --git a/system.json b/system.json index 5a2a6e8..0542947 100644 --- a/system.json +++ b/system.json @@ -4,7 +4,7 @@ "description": "A FoundryVTT system implementation of Scotty McFarland's EZD6 system", "url": "https://github.com/drl2/ezd6-fvtt", "license": "LICENSE.txt", - "version": "1.1.3", + "version": "1.1.4", "compatibility": { "minimum": "9", "verified": "12"