version 0.6.13

p4535992 · Nov 6, 2022 · 199eaab · 199eaab
1 parent 8108c97
commit 199eaab
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### 0.6.10
+### 0.6.10-11-12
 
 - BUg fix; https://github.com/p4535992/foundryvtt-inventory-plus/issues/14
 - Bug fix: https://github.com/p4535992/foundryvtt-inventory-plus/issues/13

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "inventory-plus",
     "title": "Inventory+",
     "description": "Enhances the default dnd5e sheets inventory to allow for reorganization",
-    "version": "0.6.12",
+    "version": "0.6.13",
     "main": "main.js",
   "scripts": {
     "publish": "gulp publish --update",

diff --git a/src/module.json b/src/module.json
@@ -2,7 +2,7 @@
 	"id": "inventory-plus",
 	"title": "Inventory+",
 	"description": "Enhances the default dnd5e sheets inventory to allow for reorganization",
-	"version": "0.6.12",
+	"version": "0.6.13",
 	"authors": [
 		{
 			"name": "Felix#6196"
@@ -82,8 +82,8 @@
 	"url": "https://github.com/p4535992/foundryvtt-inventory-plus",
 	"manifest": "https://github.com/p4535992/foundryvtt-inventory-plus/releases/latest/download/module.json",
 	"download": "https://github.com/p4535992/foundryvtt-inventory-plus/releases/latest/download/module.zip",
-	"readme": "https://github.com/p4535992/foundryvtt-inventory-plus/blob/v0.6.12/README.md",
-	"changelog": "https://github.com/p4535992/foundryvtt-inventory-plus/blob/v0.6.12/CHANGELOG.md",
+	"readme": "https://github.com/p4535992/foundryvtt-inventory-plus/blob/v0.6.13/README.md",
+	"changelog": "https://github.com/p4535992/foundryvtt-inventory-plus/blob/v0.6.13/CHANGELOG.md",
 	"bugs": "https://github.com/p4535992/foundryvtt-inventory-plus/issues",
 	"allowBugReporter": true,
 	"relationships": {

diff --git a/src/scripts/inventory-plus.ts b/src/scripts/inventory-plus.ts
@@ -854,21 +854,6 @@ export class InventoryPlus {
 				icon = icon + `<i class="fas fa-balance-scale-right"></i>`;
 			}
 			*/
-			if (currentCategory.ignoreWeight) {
-				icon = icon + `<i class="fas fa-feather"></i>`;
-			} else if (currentCategory.ownWeight > 0) {
-				icon = icon + `<i class="fas fa-weight-hanging"></i>`;
-			} else if (currentCategory.maxWeight > 0) {
-				icon = icon + `<i class="fas fa-balance-scale-right"></i>`;
-			}
-			if (currentCategory.ignoreBulk) {
-				icon = icon + `<i class="fas fa-feather-alt"></i>`;
-			} else if (currentCategory.ownBulk > 0) {
-				icon = icon + `<i class="fas fa-bold"></i>`;
-			} else if (currentCategory.maxBulk > 0) {
-				icon = icon + `<i class="fas fa-balance-scale-left"></i>`;
-			}
-
 			const weight = <number>this.getCategoryItemWeight(type);
 			let bulkWeightS = "";
 			let weightUnit = game.settings.get("dnd5e", "metricWeightUnits")
@@ -882,6 +867,23 @@ export class InventoryPlus {
 				? isVariantEncumbranceEnabled && game.settings.get("variant-encumbrance-dnd5e", "enableBulkSystem")
 				: false;
 
+			if (currentCategory.ignoreWeight) {
+				icon = icon + `<i class="fas fa-feather"></i>`;
+			} else if (currentCategory.ownWeight > 0) {
+				icon = icon + `<i class="fas fa-weight-hanging"></i>`;
+			} else if (currentCategory.maxWeight > 0) {
+				icon = icon + `<i class="fas fa-balance-scale-right"></i>`;
+			}
+			if (isBulked) {
+				if (currentCategory.ignoreBulk) {
+					icon = icon + `<i class="fas fa-feather-alt"></i>`;
+				} else if (currentCategory.ownBulk > 0) {
+					icon = icon + `<i class="fas fa-bold"></i>`;
+				} else if (currentCategory.maxBulk > 0) {
+					icon = icon + `<i class="fas fa-balance-scale-left"></i>`;
+				}
+			}
+
 			let bulkUnit = "bulk";
 			let weigthBulk = 0;
 			if (isBulked) {