Merge pull request #16 from Muttley/develop

Release 11.2.2
Muttley · Oct 30, 2023 · 5c47b70 · 5c47b70
2 parents 11fa20d + d66e743
commit 5c47b70
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## v11.2.2
+
+## Bugfixes
+- [#14] NPC / Creature inventory items messed up
+
+## Enhancements
+- [#15] Tidy up hunger/thirst/sleep selector layout
+
 ## v11.2.1
 
 ## Bugfixes

diff --git a/scss/components/_forms.scss b/scss/components/_forms.scss
@@ -33,7 +33,7 @@
 				height: 100%;
 				margin: 0;
 			}
-		}		
+		}
 	}
 	.chaty{
 		cursor: pointer;
@@ -362,7 +362,7 @@
 	}
 
 	&.no-padding {
-		padding: 0 !important;		
+		padding: 0 !important;
 		.box-header {
 			margin: 0 0 0 0;
 		}
@@ -480,7 +480,7 @@
 .power-armor-status {
 	position: relative;
 	max-width: 136px;
-	height: 180px;
+	height: 160px;
 	.body-part {
 		padding: 5px;
 		text-align: center;
@@ -499,3 +499,10 @@
 		}
 	}
 }
+
+.condition-meters {
+    display: grid;
+    grid-template-columns: 18px 2fr;
+    align-items: center;
+    column-gap: 8px;
+}
diff --git a/system/src/helpers/handlebars.mjs b/system/src/helpers/handlebars.mjs
@@ -28,11 +28,13 @@ export const registerHandlebarsHelpers = function() {
 	Handlebars.registerHelper("ifCond", function(v1, operator, v2, options) {
 		switch (operator) {
 			case "==":
-				return v1 === v2 ? options.fn(this) : options.inverse(this);
+				// eslint-disable-next-line eqeqeq
+				return v1 == v2 ? options.fn(this) : options.inverse(this);
 			case "===":
 				return v1 === v2 ? options.fn(this) : options.inverse(this);
 			case "!=":
-				return v1 !== v2 ? options.fn(this) : options.inverse(this);
+				// eslint-disable-next-line eqeqeq
+				return v1 != v2 ? options.fn(this) : options.inverse(this);
 			case "!==":
 				return v1 !== v2 ? options.fn(this) : options.inverse(this);
 			case "<":

diff --git a/system/src/sheets/actor-sheet.mjs b/system/src/sheets/actor-sheet.mjs
@@ -13,8 +13,8 @@ export class FalloutActorSheet extends ActorSheet {
 		return mergeObject(super.defaultOptions, {
 			classes: ["fallout", "sheet", "actor"],
 			template: "systems/fallout/templates/actor/actor-sheet.html",
-			width: 720,
-			height: 780,
+			width: 780,
+			height: 930,
 			tabs: [
 				{
 					navSelector: ".sheet-tabs",
@@ -259,7 +259,8 @@ export class FalloutActorSheet extends ActorSheet {
 		// NPC and Creature Inventory = all physical items that are not weapons
 		if (this.actor.type === "npc" || this.actor.type === "creature") {
 			context.inventory = context.items.filter(i => {
-				return i.type !== "weapon" && i.system.weight !== null;
+				const hasWeight = !isNaN(parseInt(i.system.weight ?? null));
+				return i.type !== "weapon" && hasWeight;
 			});
 		}
 		if (this.actor.type === "character") {

diff --git a/system/system.json b/system/system.json
@@ -2,7 +2,7 @@
 	"id": "fallout",
 	"title": "Fallout 2d20",
 	"description": "The Unofficial Fallout 2d20 System for FoundryVTT",
-	"version": "11.2.1",
+	"version": "11.2.2",
 	"compatibility": {
 		"minimum": "11",
 		"verified": "11"
@@ -91,5 +91,5 @@
 	"socket": true,
 	"url": "https://github.com/Muttley/foundryvtt-fallout",
 	"manifest": "https://raw.githubusercontent.com/Muttley/foundryvtt-fallout/main/system/system.json",
-	"download": "https://github.com/Muttley/foundryvtt-fallout/releases/download/release-11.2.1/fallout-release-11.2.1.zip"
+	"download": "https://github.com/Muttley/foundryvtt-fallout/releases/download/release-11.2.2/fallout-release-11.2.2.zip"
 }
diff --git a/system/templates/actor/parts/actor-conditions.html b/system/templates/actor/parts/actor-conditions.html
@@ -2,18 +2,16 @@
     <!-- <div class="box-header">
         <h4>{{localize "FALLOUT.TEMPLATES.CONDITIONS"}}</h4>
     </div> -->
-    
+
 
         <ol class="items-list">
             <li class="item consumable flexrow items-header">
                 <div class="flexrow flexlarge item-name upperC">{{localize 'FALLOUT.TEMPLATES.CONDITIONS'}}</div>
             </li>
 
             <li class="item" style="padding: 0.25rem;">
-                <div class="text-center">
+                <div class="condition-meters text-center">
                     <i class="fa-solid fa-pot-food" title="{{localize (concat 'FALLOUT.TEMPLATES.conditions.hunger')}}"></i>
-                </div>
-                <div class="text-center">
                     {{#select system.conditions.hunger}}
                     <select name="system.conditions.hunger">
                         {{#each FALLOUT.conditions.hunger as |value key|}}
@@ -24,10 +22,8 @@ <h4>{{localize "FALLOUT.TEMPLATES.CONDITIONS"}}</h4>
                 </div>
             </li>
             <li class="item" style="padding: 0.25rem;">
-                <div class="text-center">
+                <div class="condition-meters text-center">
                     <i class="fa-solid fa-bottle-droplet" title="{{localize (concat 'FALLOUT.TEMPLATES.conditions.thirst')}}"></i>
-                </div>
-                <div class="text-center">
                     {{#select system.conditions.thirst}}
                     <select name="system.conditions.thirst">
                         {{#each FALLOUT.conditions.thirst as |value key|}}
@@ -38,10 +34,8 @@ <h4>{{localize "FALLOUT.TEMPLATES.CONDITIONS"}}</h4>
                 </div>
             </li>
             <li class="item" style="padding: 0.25rem;">
-                <div class="text-center">
+                <div class="condition-meters text-center">
                     <i class="fa-solid fa-bed" title="{{localize (concat 'FALLOUT.TEMPLATES.conditions.sleep')}}"></i>
-                </div>
-                <div class="text-center">
                     {{#select system.conditions.sleep}}
                     <select name="system.conditions.sleep">
                         {{#each FALLOUT.conditions.sleep as |value key|}}
@@ -62,4 +56,4 @@ <h4>{{localize "FALLOUT.TEMPLATES.CONDITIONS"}}</h4>
             </li>
         </ol>
 
-</div>
+</div>
diff --git a/system/templates/actor/parts/actor-status.html b/system/templates/actor/parts/actor-status.html
@@ -106,11 +106,13 @@ <h4>{{localize "FALLOUT.TEMPLATES.RESISTANCE_GENERAL_BONUS"}}</h4>
                 <h3 style="margin:0; border-bottom: none;"><strong>{{localize "FALLOUT.HEALTH.health"}}</strong></h3>
             </div>
             <div class="flexrow align-mid">
+				&nbsp;&nbsp;
                 <input class="num-short-3" style="font-size:18px; background-color: beige; color: black;" type="number"
                     name="system.health.value" value="{{system.health.value}}" min="0">
                 <span class="text-center">/</span>
                 <input class="num-short-3" style="font-size:18px; background-color: beige; color: black;" type="number"
                     name="system.health.max" value="{{system.health.max}}" min="0">
+				&nbsp;&nbsp;
             </div>
         </div>
 
@@ -134,7 +136,7 @@ <h4 style="margin:0 5px 0 0"><strong>{{localize "FALLOUT.TEMPLATES.RADIATION"}}<
         {{/ifCond}}
 
         {{#ifCond actor.type '==' 'character'}}
-        <div class="box">
+        <div class="box" style="width: 139px; margin-left: 19px;">
             <div class="box-header">
                 <h4 class="tab-switch" data-tab="apparel">{{localize "FALLOUT.TEMPLATES.POWER_ARMOR_HEALTH"}}</h4>
             </div>
@@ -238,4 +240,4 @@ <h4 style="margin: 0 -4px; padding: 2px; background-color: #00000040;">{{item.na
     <div>
         {{> "systems/fallout/templates/actor/parts/actor-conditions.html"}}
     </div>
-</div>
+</div>
diff --git a/utils/javascript.mjs b/utils/javascript.mjs
@@ -52,17 +52,10 @@ function lintJavascript() {
 }
 export const lint = lintJavascript;
 
-// Wait
-//
-export const wait = async () => {
-	await delay(1500);
-	livereload.reload();
-};
-
 // Watch for file changes and lint when they do
 //
 export async function watchJavascriptUpdates() {
 	livereload.listen();
-	gulp.watch(SRC_LINT_PATHS, gulp.parallel(lint, compile, wait));
+	gulp.watch(SRC_LINT_PATHS, gulp.parallel(lint, compile));
 }
 export const watchUpdates = watchJavascriptUpdates;