Merge pull request #323 from mrkwnzl/develop

v2.8.1
mrkwnzl · Jul 16, 2023 · db507b1 · db507b1
2 parents 2150607 + 66b099d
commit db507b1
Show file tree

Hide file tree

Showing 36 changed files with 140 additions and 177 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,18 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [3.8.0] - 2023-07-14
+## [2.8.1] - 2023-07-16
+### Fixed
+- Attacks on NPCs don’t show an extra comma anymore in their notes.
+- The Base Difficulty no longer locks after selecting a difficulty in the All-in-One dialog.
+- Fixed dragging & dropping items onto actors.
+
+## [2.8.0] - 2023-07-14
 ### Added
 - Abilities now have buttons in their setting sheet to quickly copy them as skills or attacks.
 - Attacks and armor now have buttons in their setting sheet to quickly copy them as equipment.
 - New Difficulty Controls, which can be found in the Token Controls. With that, you can set a difficulty for the next roll or set a persistent difficulty which stays active until it’s being changed again. This also integrates with the Calculate/Announce Difficulty macro, which will set the difficulty and whether it’s for a single roll or persistent in the Difficulty Controls. 
+
   If the GM keeps the difficulty a secret (by not selecting “Show difficulty to everyone”), it won’t show up in the Difficulty Controls (wouldn’t be a secret, then). It will be set to ”None” in that case.
 
 ### Changed

diff --git a/ReadMe.md b/ReadMe.md
@@ -27,17 +27,21 @@ Documentation: [Getting Started](https://github.com/mrkwnzl/cyphersystem-foundry
 
 The [Cypher SRD Compendium](https://foundryvtt.com/packages/cyphersystem-compendium) contains all the content from the Cypher System Reference Document.
 
+The [Cypher System Community Content](https://foundryvtt.com/packages/cyphersystem-community-module) module adds fan-made material you can use in your game. It also includes example PCs which showcase how to use different features of the system, which is a great way to learn it.
+
 ## Add-on Modules
 
 Install these modules only if you specifically need the functionality provided by these modules. I recommend playing a few times without them to see if there’s something missing for you.
 
+The only modules I recommend if you are using tokens and maps are [Bar Brawl](https://foundryvtt.com/packages/barbrawl) and [Drag Ruler](https://foundryvtt.com/packages/drag-ruler). But even those are by no means essential.
+
 ### Cypher-Specific Modules
 
 These modules have been written specifically to expand the functionality of the Cypher System.
 - [Active Effects for the Cypher System](https://foundryvtt.com/packages/cyphersystem-activeeffects)
-- [Cypher System Character Creation Pack/Compendium](https://foundryvtt.com/packages/cypher-addons-compendiums)
+- [Cypher System Character Creation Pack/Compendium](https://foundryvtt.com/packages/cypher-addons-compendiums) (**Note:** The CSRD Compendium gives you everything you need. The Creation Pack is used to rigidly automate the character creation process, not to make that process easier. In fact, this module complicates using the system.)
 - [Cypher System Combat Tracker](https://foundryvtt.com/packages/cyphercombat)
-- [Cypher System Custom Sheets](https://foundryvtt.com/packages/cyphersheets)
+- [Cypher System Custom Sheets](https://foundryvtt.com/packages/cyphersheets) (**Note:** These are pre-made custom sheets you cannot customize. The base system allows you to customize the sheets with your own backgrounds & logos, but this functionality will be overwritten when using this module.)
 - [Nice(TSY) Cypher System Add-ons](https://foundryvtt.com/packages/nice-cypher-add-ons)
 
 ### Modules with Cypher System Integration
@@ -115,4 +119,4 @@ The following graphics are taken from various sources, or have been created spec
 - smaug18#2066: xp-marker.png
 - The-Auteur-Stock ([https://www.deviantart.com](https://www.deviantart.com/the-auteur-stock)): Wooden Table Texture
 - wojtar-stock ([https://www.deviantart.com/wojtar-stock](https://www.deviantart.com/wojtar-stock)): metal texture 12
-- zoestock ([https://www.deviantart.com/zoestock](https://www.deviantart.com/zoestock)): slightly wrinkled paper
+- zoestock ([https://www.deviantart.com/zoestock](https://www.deviantart.com/zoestock)): slightly wrinkled paper
diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js
@@ -542,8 +542,6 @@ export class CypherActorSheet extends ActorSheet {
     // Add Inventory Item
     html.find(".item-create").click(clickEvent => {
       const itemCreatedPromise = this._onItemCreate(clickEvent);
-      console.log(this);
-      console.log(clickEvent);
       itemCreatedPromise.then(itemData => {
         this.actor.items.get(itemData.id).sheet.render(true);
       });
@@ -770,7 +768,9 @@ export class CypherActorSheet extends ActorSheet {
     let targetItem = null;
 
     // Sort item into category
-    originItemData.system.settings.general.sorting = await sortItemsIntoCategories(event, originItemData);
+    if (["skill", "ability", "equipment"].includes(originItemData.type)) {
+      originItemData.system.settings.general.sorting = await sortItemsIntoCategories(event, originItemData);
+    }
 
     // Check for duplicate character properties
     for (let item of targetActor.items) {
@@ -794,9 +794,16 @@ export class CypherActorSheet extends ActorSheet {
 
     // Handle character properties
     if (typesCharacterProperties.includes(originItem.type)) {
+      // Only PCs and Companions can carry character properties
       if (!["pc", "companion"].includes(targetActor.type)) return ui.notifications.warn(game.i18n.localize("CYPHERSYSTEM.CharacterPropertiesCanOnlySharedAcrossPCs"));
-      if (!["companion"].includes(targetActor.type) && !["skill", "ability"].includes(originItem.type) && item.system.settings.general.unmaskedForm == "Teen") return ui.notifications.warn(game.i18n.localize("CYPHERSYSTEM.ItemTypeCannotBeMovedToCompanion"));
+
+      // Companions can only carry skills and abilities, and not ones for teens
+      if (["companion"].includes(targetActor.type) && (!["skill", "ability"].includes(originItem.type) || originItem.system.settings.general.unmaskedForm == "Teen")) return ui.notifications.warn(game.i18n.localize("CYPHERSYSTEM.ItemTypeCannotBeMovedToCompanion"));
+
+      // Create Item
       targetActor.createEmbeddedDocuments("Item", [originItemData]);
+
+      // Enable the appropriate list
       enableItemLists();
     }
 

diff --git a/module/forms/roll-engine-dialog-sheet.js b/module/forms/roll-engine-dialog-sheet.js
@@ -30,6 +30,8 @@ export class RollEngineDialogSheet extends FormApplication {
 
     if (!data.title) data.title = game.i18n.localize("CYPHERSYSTEM.StatRoll");
 
+    data.useGlobalDifficulty = game.settings.get("cyphersystem", "rollDifficulty");
+
     data.effortValue = actor.system.basic.effort;
 
     data.mightValue = (data.teen) ? actor.system.teen.pools.might.value : actor.system.pools.might.value;
@@ -96,8 +98,6 @@ export class RollEngineDialogSheet extends FormApplication {
 
     let actor = (data.actorUuid.includes("Token")) ? fromUuidSync(data.actorUuid).actor : fromUuidSync(data.actorUuid);
 
-    console.log(formData);
-
     // Basic data
     data.baseDifficulty = parseInt(formData.baseDifficulty);
     data.pool = formData.pool;

diff --git a/module/utilities/handlebars.js b/module/utilities/handlebars.js
@@ -31,4 +31,74 @@ export async function registerHandlebars() {
     if (type == "level") return sheetData.enrichedHTML.itemLevel[itemID];
     if (type == "depletion") return sheetData.enrichedHTML.itemDepletion[itemID];
   });
+
+  Handlebars.registerHelper("createAttackNotes", function (item) {
+    const outputArray = [];
+    let output = "";
+
+    // Add attack type
+    if (item.system.basic.type == "light weapon") {
+      outputArray.push(game.i18n.localize("CYPHERSYSTEM.LightWeapon"));
+    } else if (item.system.basic.type == "medium weapon") {
+      outputArray.push(game.i18n.localize("CYPHERSYSTEM.MediumWeapon"));
+    } else if (item.system.basic.type == "heavy weapon") {
+      outputArray.push(game.i18n.localize("CYPHERSYSTEM.HeavyWeapon"));
+    } else if (item.system.basic.type == "artifact") {
+      outputArray.push(game.i18n.localize("CYPHERSYSTEM.Artifact"));
+    } else if (item.system.basic.type == "special ability") {
+      outputArray.push(game.i18n.localize("CYPHERSYSTEM.SpecialAbility"));
+    }
+
+    // Add total modified
+    if (item.system.totalModified) {
+      outputArray.push(item.system.totalModified);
+    }
+
+    // Add range
+    if (item.system.basic.range) {
+      outputArray.push(item.system.basic.range);
+    }
+
+    // Add notes
+    if (item.system.basic.notes) {
+      outputArray.push(item.system.basic.notes);
+    }
+
+    // Put everything together in the output
+    if (outputArray.length >= 1) {
+      output = "(" + outputArray.join(", ") + ")";
+    }
+
+    return output;
+  });
+
+  Handlebars.registerHelper("createArmorNotes", function (item) {
+    const outputArray = [];
+    let output = "";
+
+    // Add attack type
+    if (item.system.basic.type == "light armor") {
+      outputArray.push(game.i18n.localize("CYPHERSYSTEM.LighArmor"));
+    } else if (item.system.basic.type == "medium armor") {
+      outputArray.push(game.i18n.localize("CYPHERSYSTEM.MediumArmor"));
+    } else if (item.system.basic.type == "heavy armor") {
+      outputArray.push(game.i18n.localize("CYPHERSYSTEM.HeavyArmor"));
+    } else if (item.system.basic.type == "artifact") {
+      outputArray.push(game.i18n.localize("CYPHERSYSTEM.Artifact"));
+    } else if (item.system.basic.type == "special ability") {
+      outputArray.push(game.i18n.localize("CYPHERSYSTEM.SpecialAbility"));
+    }
+
+    // Add notes
+    if (item.system.basic.notes) {
+      outputArray.push(item.system.basic.notes);
+    }
+
+    // Put everything together in the output
+    if (outputArray.length >= 1) {
+      output = "(" + outputArray.join(", ") + ")";
+    }
+
+    return output;
+  });
 }
diff --git a/packs/markers/000235.log → packs/markers/000265.log b/packs/markers/000235.log → packs/markers/000265.log
diff --git a/packs/markers/CURRENT b/packs/markers/CURRENT
@@ -1 +1 @@
-MANIFEST-000234
+MANIFEST-000264
diff --git a/packs/markers/LOG b/packs/markers/LOG
@@ -1,3 +1,3 @@
-2023/07/14-15:30:04.198866 30d36d000 Recovering log #232
-2023/07/14-15:30:04.199302 30d36d000 Delete type=3 #230
-2023/07/14-15:30:04.199343 30d36d000 Delete type=0 #232
+2023/07/16-21:07:33.953756 30cc61000 Recovering log #263
+2023/07/16-21:07:33.954384 30cc61000 Delete type=0 #263
+2023/07/16-21:07:33.954434 30cc61000 Delete type=3 #262
diff --git a/packs/markers/LOG.old b/packs/markers/LOG.old
@@ -1,8 +1,3 @@
-2023/07/14-15:29:43.742845 30c36f000 Recovering log #229
-2023/07/14-15:29:43.743289 30c36f000 Delete type=3 #228
-2023/07/14-15:29:43.743336 30c36f000 Delete type=0 #229
-2023/07/14-15:30:01.391481 30626b000 Level-0 table #233: started
-2023/07/14-15:30:01.391506 30626b000 Level-0 table #233: 0 bytes OK
-2023/07/14-15:30:01.391592 30626b000 Delete type=0 #231
-2023/07/14-15:30:01.391982 30626b000 Manual compaction at level-0 from '!actors!5Q0EHfaj9oRsZI60' @ 72057594037927935 : 1 .. '!actors!y0TbX4GPi4HOajtz' @ 0 : 0; will stop at (end)
-2023/07/14-15:30:01.392168 30626b000 Manual compaction at level-1 from '!actors!5Q0EHfaj9oRsZI60' @ 72057594037927935 : 1 .. '!actors!y0TbX4GPi4HOajtz' @ 0 : 0; will stop at (end)
+2023/07/16-18:49:36.457472 30b7de000 Recovering log #261
+2023/07/16-18:49:36.458049 30b7de000 Delete type=3 #260
+2023/07/16-18:49:36.458123 30b7de000 Delete type=0 #261
diff --git a/packs/markers/MANIFEST-000234 → packs/markers/MANIFEST-000264 b/packs/markers/MANIFEST-000234 → packs/markers/MANIFEST-000264
diff --git a/packs/roll-macros/000235.log → packs/roll-macros/000265.log b/packs/roll-macros/000235.log → packs/roll-macros/000265.log
diff --git a/packs/roll-macros/CURRENT b/packs/roll-macros/CURRENT
@@ -1 +1 @@
-MANIFEST-000234
+MANIFEST-000264
diff --git a/packs/roll-macros/LOG b/packs/roll-macros/LOG
@@ -1,3 +1,3 @@
-2023/07/14-15:30:04.198866 30cb6e000 Recovering log #232
-2023/07/14-15:30:04.199285 30cb6e000 Delete type=3 #230
-2023/07/14-15:30:04.199329 30cb6e000 Delete type=0 #232
+2023/07/16-21:07:33.953757 30c462000 Recovering log #263
+2023/07/16-21:07:33.954408 30c462000 Delete type=0 #263
+2023/07/16-21:07:33.954454 30c462000 Delete type=3 #262
diff --git a/packs/roll-macros/LOG.old b/packs/roll-macros/LOG.old
@@ -1,8 +1,3 @@
-2023/07/14-15:29:43.742845 30d36d000 Recovering log #229
-2023/07/14-15:29:43.743259 30d36d000 Delete type=3 #228
-2023/07/14-15:29:43.743306 30d36d000 Delete type=0 #229
-2023/07/14-15:30:01.389414 30626b000 Level-0 table #233: started
-2023/07/14-15:30:01.389438 30626b000 Level-0 table #233: 0 bytes OK
-2023/07/14-15:30:01.389517 30626b000 Delete type=0 #231
-2023/07/14-15:30:01.390330 30626b000 Manual compaction at level-0 from '!macros!2EXYyOk3BhpGWdsz' @ 72057594037927935 : 1 .. '!macros!zauvL2uFWfNk1eoa' @ 0 : 0; will stop at (end)
-2023/07/14-15:30:01.390833 30626b000 Manual compaction at level-1 from '!macros!2EXYyOk3BhpGWdsz' @ 72057594037927935 : 1 .. '!macros!zauvL2uFWfNk1eoa' @ 0 : 0; will stop at (end)
+2023/07/16-18:49:36.457471 30a7e0000 Recovering log #261
+2023/07/16-18:49:36.458061 30a7e0000 Delete type=3 #260
+2023/07/16-18:49:36.458132 30a7e0000 Delete type=0 #261
diff --git a/packs/roll-macros/MANIFEST-000234 → packs/roll-macros/MANIFEST-000264 b/packs/roll-macros/MANIFEST-000234 → packs/roll-macros/MANIFEST-000264
diff --git a/packs/scenes/000238.log → packs/scenes/000268.log b/packs/scenes/000238.log → packs/scenes/000268.log
diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT
@@ -1 +1 @@
-MANIFEST-000237
+MANIFEST-000267
diff --git a/packs/scenes/LOG b/packs/scenes/LOG
@@ -1,3 +1,3 @@
-2023/07/14-15:30:04.206988 30cb6e000 Recovering log #235
-2023/07/14-15:30:04.207404 30cb6e000 Delete type=3 #233
-2023/07/14-15:30:04.207453 30cb6e000 Delete type=0 #235
+2023/07/16-21:07:33.963791 30c462000 Recovering log #266
+2023/07/16-21:07:33.964317 30c462000 Delete type=0 #266
+2023/07/16-21:07:33.964366 30c462000 Delete type=3 #265
diff --git a/packs/scenes/LOG.old b/packs/scenes/LOG.old
@@ -1,8 +1,3 @@
-2023/07/14-15:29:43.745566 30cb6e000 Recovering log #232
-2023/07/14-15:29:43.746231 30cb6e000 Delete type=3 #231
-2023/07/14-15:29:43.746309 30cb6e000 Delete type=0 #232
-2023/07/14-15:30:01.391653 30626b000 Level-0 table #236: started
-2023/07/14-15:30:01.391670 30626b000 Level-0 table #236: 0 bytes OK
-2023/07/14-15:30:01.391919 30626b000 Delete type=0 #234
-2023/07/14-15:30:01.392155 30626b000 Manual compaction at level-0 from '!scenes!cyegwAT3gg2ReiDd' @ 72057594037927935 : 1 .. '!scenes.tiles!zGOpPJI2pfmCRiwr.oJ1bePM16XIyXFV2' @ 0 : 0; will stop at (end)
-2023/07/14-15:30:01.392457 30626b000 Manual compaction at level-1 from '!scenes!cyegwAT3gg2ReiDd' @ 72057594037927935 : 1 .. '!scenes.tiles!zGOpPJI2pfmCRiwr.oJ1bePM16XIyXFV2' @ 0 : 0; will stop at (end)
+2023/07/16-18:49:36.461565 30a7e0000 Recovering log #264
+2023/07/16-18:49:36.462119 30a7e0000 Delete type=0 #264
+2023/07/16-18:49:36.462175 30a7e0000 Delete type=3 #263
diff --git a/packs/scenes/MANIFEST-000237 → packs/scenes/MANIFEST-000267 b/packs/scenes/MANIFEST-000237 → packs/scenes/MANIFEST-000267
diff --git a/packs/secret-settings/000238.log → packs/secret-settings/000268.log b/packs/secret-settings/000238.log → packs/secret-settings/000268.log
diff --git a/packs/secret-settings/CURRENT b/packs/secret-settings/CURRENT
@@ -1 +1 @@
-MANIFEST-000237
+MANIFEST-000267
diff --git a/packs/secret-settings/LOG b/packs/secret-settings/LOG
@@ -1,3 +1,3 @@
-2023/07/14-15:30:04.212935 30bb70000 Recovering log #235
-2023/07/14-15:30:04.213341 30bb70000 Delete type=3 #233
-2023/07/14-15:30:04.213397 30bb70000 Delete type=0 #235
+2023/07/16-21:07:33.972626 30bc63000 Recovering log #266
+2023/07/16-21:07:33.973099 30bc63000 Delete type=0 #266
+2023/07/16-21:07:33.973142 30bc63000 Delete type=3 #265
diff --git a/packs/secret-settings/LOG.old b/packs/secret-settings/LOG.old
@@ -1,8 +1,3 @@
-2023/07/14-15:29:43.749566 30d36d000 Recovering log #232
-2023/07/14-15:29:43.749960 30d36d000 Delete type=3 #231
-2023/07/14-15:29:43.750006 30d36d000 Delete type=0 #232
-2023/07/14-15:30:01.392176 30626b000 Level-0 table #236: started
-2023/07/14-15:30:01.392210 30626b000 Level-0 table #236: 0 bytes OK
-2023/07/14-15:30:01.392334 30626b000 Delete type=0 #234
-2023/07/14-15:30:01.392648 30626b000 Manual compaction at level-0 from '!folders!8ErwbQwBInWCNZrK' @ 72057594037927935 : 1 .. '!macros!zKoXNFTgRvzhyQ80' @ 0 : 0; will stop at (end)
-2023/07/14-15:30:01.392850 30626b000 Manual compaction at level-1 from '!folders!8ErwbQwBInWCNZrK' @ 72057594037927935 : 1 .. '!macros!zKoXNFTgRvzhyQ80' @ 0 : 0; will stop at (end)
+2023/07/16-18:49:36.467284 30afdf000 Recovering log #264
+2023/07/16-18:49:36.467787 30afdf000 Delete type=0 #264
+2023/07/16-18:49:36.467839 30afdf000 Delete type=3 #263
diff --git a/packs/secret-settings/MANIFEST-000237 → packs/secret-settings/MANIFEST-000267 b/packs/secret-settings/MANIFEST-000237 → packs/secret-settings/MANIFEST-000267
diff --git a/packs/utility-macros/000238.log → packs/utility-macros/000268.log b/packs/utility-macros/000238.log → packs/utility-macros/000268.log
diff --git a/packs/utility-macros/CURRENT b/packs/utility-macros/CURRENT
@@ -1 +1 @@
-MANIFEST-000237
+MANIFEST-000267
diff --git a/packs/utility-macros/LOG b/packs/utility-macros/LOG
@@ -1,3 +1,3 @@
-2023/07/14-15:30:04.211575 30c36f000 Recovering log #235
-2023/07/14-15:30:04.212036 30c36f000 Delete type=3 #233
-2023/07/14-15:30:04.212087 30c36f000 Delete type=0 #235
+2023/07/16-21:07:33.970292 30cc61000 Recovering log #266
+2023/07/16-21:07:33.970761 30cc61000 Delete type=0 #266
+2023/07/16-21:07:33.970805 30cc61000 Delete type=3 #265
diff --git a/packs/utility-macros/LOG.old b/packs/utility-macros/LOG.old
@@ -1,8 +1,3 @@
-2023/07/14-15:29:43.747986 30c36f000 Recovering log #232
-2023/07/14-15:29:43.748428 30c36f000 Delete type=3 #231
-2023/07/14-15:29:43.748489 30c36f000 Delete type=0 #232
-2023/07/14-15:30:01.391991 30626b000 Level-0 table #236: started
-2023/07/14-15:30:01.392009 30626b000 Level-0 table #236: 0 bytes OK
-2023/07/14-15:30:01.392099 30626b000 Delete type=0 #234
-2023/07/14-15:30:01.392445 30626b000 Manual compaction at level-0 from '!folders!4UbhADT9HJqnF5SH' @ 72057594037927935 : 1 .. '!macros!zsIv77BoamIDFfk2' @ 0 : 0; will stop at (end)
-2023/07/14-15:30:01.392659 30626b000 Manual compaction at level-1 from '!folders!4UbhADT9HJqnF5SH' @ 72057594037927935 : 1 .. '!macros!zsIv77BoamIDFfk2' @ 0 : 0; will stop at (end)
+2023/07/16-18:49:36.464896 30b7de000 Recovering log #264
+2023/07/16-18:49:36.465449 30b7de000 Delete type=0 #264
+2023/07/16-18:49:36.465510 30b7de000 Delete type=3 #263
diff --git a/packs/utility-macros/MANIFEST-000237 → packs/utility-macros/MANIFEST-000267 b/packs/utility-macros/MANIFEST-000237 → packs/utility-macros/MANIFEST-000267
diff --git a/system.json b/system.json
@@ -2,14 +2,14 @@
   "id": "cyphersystem",
   "title": "Cypher System",
   "description": "A flexible implementation of the Cypher System for Foundry VTT.",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "compatibility": {
     "minimum": "11",
     "verified": "11.305"
   },
   "url": "https://github.com/mrkwnzl/cyphersystem-foundryvtt",
   "manifest": "https://raw.githubusercontent.com/mrkwnzl/cyphersystem-foundryvtt/main/system.json",
-  "download": "https://github.com/mrkwnzl/cyphersystem-foundryvtt/releases/download/v2.8.0/release.zip",
+  "download": "https://github.com/mrkwnzl/cyphersystem-foundryvtt/releases/download/v2.8.1/release.zip",
   "authors": [
     {
       "name": "Marko Wenzel",

diff --git a/templates/forms/roll-engine-dialog-sheet.html b/templates/forms/roll-engine-dialog-sheet.html
@@ -10,7 +10,7 @@
       <div class="roll-engine-left-column" align="center">
         <label class="roll-engine-heading"><b>{{localize "CYPHERSYSTEM.BasicModifiers"}}</b></label><br>
         <label class="roll-engine-label">{{localize "CYPHERSYSTEM.BaseDifficulty"}}:</label>
-        {{#if (eq this.baseDifficulty "none")}}
+        {{#if (eq this.useGlobalDifficulty -1)}}
           <select name="baseDifficulty" id="baseDifficulty" class="dialog-select roll-engine-select">
             {{#select this.baseDifficulty}}
               <option value="none">{{localize "CYPHERSYSTEM.None"}}</option>

diff --git a/templates/item-lists/armor-list-teen.html b/templates/item-lists/armor-list-teen.html
@@ -5,31 +5,7 @@ <h4 class="item-name">
         <i id="arrow-{{item._id}}" class="fas fa-angle-{{#if (expanded item._id)}}down{{else}}right{{/if}} item-angle" aria-hidden="true"></i>
         {{~item.name}}
       </a>
-      {{#if (or (ne item.system.basic.notes "") (ne item.system.basic.type "n/a"))}}
-        {{localize 'CYPHERSYSTEM.OpenParenthesis' ~}}
-      {{/if}}
-      {{#if (eq item.system.basic.type "artifact") ~}}
-        {{localize 'CYPHERSYSTEM.Artifact' ~}}
-      {{else if (eq item.system.basic.type "special ability") ~}}
-        {{localize 'CYPHERSYSTEM.SpecialAbility' ~}}
-      {{else if (eq item.system.basic.type "light armor") ~}}
-        {{localize 'CYPHERSYSTEM.LightArmor' ~}}
-      {{else if (eq item.system.basic.type "medium armor") ~}}
-        {{localize 'CYPHERSYSTEM.MediumArmor' ~}}
-      {{else if (eq item.system.basic.type "heavy armor") ~}}
-        {{localize 'CYPHERSYSTEM.HeavyArmor' ~}}
-      {{else if (eq item.system.basic.type "artifact") ~}}
-        {{localize 'CYPHERSYSTEM.Artifact' ~}}
-      {{/if ~}}
-      {{~#unless (eq item.system.basic.notes "") ~}}
-        {{~#if (ne item.system.basic.type "n/a")}}
-          {{~ localize 'CYPHERSYSTEM.Comma'}}
-        {{/if}}
-        {{~ item.system.basic.notes}}
-      {{~/unless ~}}
-      {{~#if (or (ne item.system.basic.notes "") (ne item.system.basic.type "n/a"))}}
-        {{~localize 'CYPHERSYSTEM.CloseParenthesis'}}
-      {{~/if}}
+      {{createArmorNotes item}}
     </h4>
     <div class="item-quantity">{{item.system.basic.rating}}/{{item.system.basic.cost}}</div>
     <div class="item-controls">