Merge pull request #11686 from MadCoder253/gurps-2.9.7

GURPS 2.9.7
2023-04-03 20:44:07 -03:00
parent e1bc286b58 a5e2e8a870
commit 1a7320741a
1 changed files with 180 additions and 13 deletions
@@ -4359,13 +4359,10 @@
 					<input type="text" name="attr_announcement_version" readonly="readonly" value="0" title="GURPS Character Sheet Version" />
 				</h4>

-				<!-- current version notes: 2.9.6 -->
+				<!-- current version notes: 2.9.7 -->
 				<ul>
 					<li>
-						Inventory Tab. Updated the table to better handle parent/child relationships. You can assign an item to have a parent item 
-						and select an indent level. When you assign a parent to an inventory item, the location field will be updated to show the name of the parent.
-						<b>Tip:</b> A sorting button is under development, until then you can manually move items beneath 
-						parent items.
+						Bugfix: Stress and Derangement wasn't being divided by 2, rounded up.
 					</li>
 				</ul>
 					
@@ -14727,13 +14724,10 @@ Select the indent level of the inventory item. This is handy to help show the it

 			<p>Pull Request: <span name="attr_latest_changes"></span></p>

-			<!-- current version notes: 2.9.6 -->
+			<!-- current version notes: 2.9.7 -->
 			<ul>
 				<li>
-					Inventory Tab. Updated the table to better handle parent/child relationships. You can assign an item to have a parent item 
-					and select an indent level. When you assign a parent to an inventory item, the location field will be updated to show the name of the parent.
-					<b>Tip:</b> A sorting button is under development, until then you can manually move items beneath 
-					parent items.
+					Bugfix: Stress and Derangement wasn't being divided by 2, rounded up.
 				</li>
 			</ul>

@@ -18933,9 +18927,9 @@ Diffuse: Max 2HP (Exception: Area-effect, cone, and explosion attacks cause norm
 	
 	const noop = function () { }; // do nothing callback function.
 	
-	const version = "2.9.6";
+	const version = "2.9.7";
 	
-	const latestChangesDate = "3/28/2023";
+	const latestChangesDate = "4/11/2023";
 	
 	let modCascade = true;
 	
@@ -20562,7 +20556,7 @@ Diffuse: Max 2HP (Exception: Area-effect, cone, and explosion attacks cause norm
 			let stressLevel = Number(v.stress_level) || 0;
 			let derangementLevel = Number(v.derangement_level) || 0;

-			let stressDerangementPenalty = stressLevel + derangementLevel;
+			let stressDerangementPenalty = Math.ceil((stressLevel + derangementLevel)/2);

 			setAttrs({
 				willpower_base: wBase,
@@ -25286,6 +25280,12 @@ Diffuse: Max 2HP (Exception: Area-effect, cone, and explosion attacks cause norm
 		
 	});

+	on("clicked:sort_inventory", async (event) => {
+
+		//await sortIndentInventoryAsync();
+		
+	});
+
 	/**
 	 * We're going to generate an inventory tree and use that to find
 	 * child items of the parentId and update their checked status.
@@ -25321,6 +25321,53 @@ Diffuse: Max 2HP (Exception: Area-effect, cone, and explosion attacks cause norm
 		
 	};

+	let sortIndentInventoryAsync = async () => {
+
+		let treeData = await getInventoryTreeData();
+
+		// before making the tree, let's sort everything
+		// see: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort
+		treeData = treeData.sort((item1, item2) => {
+
+			const item1Name = item1.name.toUpperCase();
+			const item2Name = item2.name.toUpperCase();
+
+			if (item1Name < item2Name) {
+				return -1;
+			}
+
+			if (item1Name > item2Name) {
+				return 1;
+			}
+
+			// names must be equeal
+			return 0;
+
+		});
+
+		const inventoryTree = getInventoryTree(treeData);
+
+		// get ALL the data for each inventory item so we can re-insert them.
+		const inventoryItems = await getInventoryItems();
+
+		// start at -1 since the root level doesn't get added to the table.
+		const tableItems = getInventoryTableItems({}, inventoryTree, -1, inventoryItems);
+
+		// clear the existing table
+		treeData.forEach(node => {
+
+			if (node.id !== "root") {
+				setTimeout(() => {
+					removeRepeatingRow(`repeating_item_${node.id}`)
+				},300);
+			}
+			
+		})
+
+		setAttrs(tableItems);
+
+	};
+
 	/**
 	 * Gets an array of each inventory item as an object; id, name, parentId
 	 * This can be used to generate a tree structure.
@@ -25474,6 +25521,126 @@ Diffuse: Max 2HP (Exception: Area-effect, cone, and explosion attacks cause norm

 	}; 

+	/**
+	 * Returns an array of inventory objects
+	 */
+	let getInventoryItems = async() => {
+
+		let ids = await getSectionIDsAsync("repeating_item");
+
+		// index will correspond with indexes for ids!
+		let fieldsToGet = [];
+
+		ids.forEach( id => {
+
+			let itemHighlightField = `repeating_item_${id}_highlight`;
+			fieldsToGet.push(itemHighlightField);
+
+			let itemItemToggleNotesField = `repeating_item_${id}_item_toggle_notes`;
+			fieldsToGet.push(itemItemToggleNotesField);
+
+			let itemIndentLevelField = `repeating_item_${id}_indent_level`;
+			fieldsToGet.push(itemIndentLevelField);
+
+			let itemNameField = `repeating_item_${id}_name`;
+			fieldsToGet.push(itemNameField);
+
+			let itemLocationField = `repeating_item_${id}_location`;
+			fieldsToGet.push(itemLocationField);
+
+			let itemTechLevelField = `repeating_item_${id}_tl`;
+			fieldsToGet.push(itemTechLevelField);
+
+			let itemLegalityClassField = `repeating_item_${id}_legality_class`;
+			fieldsToGet.push(itemLegalityClassField);
+
+			let itemRefField = `repeating_item_${id}_ref`;
+			fieldsToGet.push(itemRefField);
+
+			let itemCarriedField = `repeating_item_${id}_carried`;
+			fieldsToGet.push(itemCarriedField);
+
+			let itemCountField = `repeating_item_${id}_count`;
+			fieldsToGet.push(itemCountField);
+
+			let itemCostField = `repeating_item_${id}_cost`;
+			fieldsToGet.push(itemCostField);
+
+			let itemWeightField = `repeating_item_${id}_weight`;
+			fieldsToGet.push(itemWeightField);
+
+			let itemRowIdField = `repeating_item_${id}_row_id`;
+			fieldsToGet.push(itemRowIdField);
+
+			let itemParentIdField = `repeating_item_${id}_parent_id`;
+			fieldsToGet.push(itemParentIdField);
+			
+			let itemNotesField = `repeating_item_${id}_notes`;
+			fieldsToGet.push(itemNotesField);
+
+		});
+
+		let values = await getAttrsAsync(fieldsToGet);
+
+		return values;
+
+	};
+
+	/**
+	 * Get all the data for building the inventory table
+	 * 
+	 * @param object tableItems     Items for repeating_item table
+	 * @param object itemNode       The current node on the tree
+	 * @param int    indentLevel    The depth level of the tree.
+	 * @param object inventoryItems Original item data from repeating_item talbe
+	 * @return object Data for repeating_item
+	 */
+	let getInventoryTableItems = (tableItems, itemNode, indentLevel, inventoryItems) => {
+
+		// ignore the root level
+		if (itemNode.id != "root") {
+
+			// filter objects: https://masteringjs.io/tutorials/fundamentals/filter-object
+
+			// convert object to an array
+			const inventoryItemsAsArray = Object.entries(inventoryItems);
+
+			// get filtered data
+
+			// get the data for the inventory usig the row id.
+			// example array: ["repeating_item_-mtzce6xvluz3aksvzqo_row_id": "-mtzce6xvluz3aksvzqo", "repeating_item_-mtzce6xvluz3aksvzqo_name": "Purse", key: value]
+			const inventoryItemsFiltered = inventoryItemsAsArray.filter( ([key, value]) => {
+				return key.includes(itemNode.id);
+			});
+
+			// set the indent level
+			inventoryItemsFiltered[`repeating_item_${itemNode.id}_indent_level`] = indentLevel;
+
+			// convert to object
+			const inventoryData = Object.fromEntries(inventoryItemsFiltered);
+			
+			// loop through each property and add it to the original tableItems
+			Object.keys(inventoryData).forEach( key => {
+
+				tableItems[key] = inventoryData[key];
+
+			});
+			
+		}
+
+		// get child items
+		// now add any children
+		itemNode.children.forEach(childNode => {
+
+			tableItems = getInventoryTableItems(tableItems, childNode, indentLevel + 1, inventoryItems);
+
+		});
+
+
+		return tableItems;
+		
+	}
+
 	on("change:repeating_item:parent_id", event => {

 		if (event.sourceType === "player") {