Updating to fix issues where prices were not respected

NickClearyTech · Jan 12, 2023 · babc5e5 · babc5e5
1 parent 3723cde
commit babc5e5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/shop-generator/module.json b/shop-generator/module.json
@@ -10,7 +10,7 @@
   "esmodules": [
     "modules/main.js"
   ],
-  "version": "1.0.3",
+  "version": "1.0.4",
   "compatibility": {
     "minimum": "9",
     "verified": "10"

diff --git a/shop-generator/modules/compendium.js b/shop-generator/modules/compendium.js
@@ -17,7 +17,6 @@ export async function mapCompendiumContentsToRarity(compendiumName, shopType) {
             hasWarnings = true;
             continue
         }
-        console.error(item);
         const rarity = item.system[rarityOrLevel].toString().toLowerCase();
         if (rarity === "artifact") {
             consoleLogging(`${item.name} is an artifact, skipping`, "warn");

diff --git a/shop-generator/modules/generator.js b/shop-generator/modules/generator.js
@@ -2,9 +2,9 @@ import {Constants} from "./values.js";
 import {mapCompendiumContentsToRarity} from "./compendium.js";
 import {getRandomInt, getRandomItemsWithDuplicates, getRandomItemsWithoutDuplication, getRandomItemWithChance} from "./utils/generator_utils.js";
 import { getRarities } from "./utils/compendium_utils.js";
+import { getObjectPrice } from "./utils/pricing.js";
 
 export async function generateItemShop(shopSettings, type) {
-    console.error(shopSettings);
     // Initialize the chat message
     let chatMessage = "<h1>Shop Contents</h1>";
     // Get the compendium's contents as a map of rarities to arrays of items
@@ -29,7 +29,7 @@ export async function generateItemShop(shopSettings, type) {
             chatMessage = chatMessage.concat(`<h2>${rarities[rarity]}:</h2><br/><table><tr><td>Item</td><td>Quantity</td><td>Price</td></tr>`);
             // Iterate through each item, then add them to the table
             for (const item of Object.keys(items)) {
-                chatMessage = chatMessage.concat(`<tr><td>${items[item].value.name}</td><td>${items[item].quantity}</td><td>${items[item].price}</td></tr>`);
+                chatMessage = chatMessage.concat(`<tr><td>${items[item].value.name}</td><td>${items[item].quantity}</td><td>${getObjectPrice(items[item].value, type)}</td></tr>`);
             }
             chatMessage = chatMessage.concat(`</table>`);
         }

diff --git a/shop-generator/modules/presets.json b/shop-generator/modules/presets.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.3",
+  "version": "1.0.4",
   "presets": {
     "potion": {
       "metropolis": {

diff --git a/shop-generator/modules/utils/pricing.js b/shop-generator/modules/utils/pricing.js
@@ -118,8 +118,8 @@ export function getObjectPrice(item, type) {
         }
     }
     // If the price override isn't valid or the price doesn't exist, then we try to return item price
-    if (item.system.price !== null) {
-        return item.system.price;
+    if (item.system.price.value !== null && item.system.price.value !== 0) {
+        return item.system.price.value;
     }
     // If the price is null, then return -1 to signify we don't have a price
     return -1