Version 0.36.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mh-ui",
-  "version": "0.35.6",
+  "version": "0.36.0",
   "description": "Improve your MouseHunt experience.",
   "author": "Brad Parbs <brad@bradparbs.com> (https://bradparbs.com/)",
   "license": "MIT",

src/data/settings.json

@@ -1,17 +1,41 @@
 {
   "no-reminders": [
     "adblock",
-    "inline-wiki",
-    "no-footer",
-    "no-sidebar",
-    "hide-daily-reward-popup",
-    "journal-privacy",
-    "journal-privacy.show-toggle-icon",
-    "debug",
+    "better-gifts.ignore-bad-gifts",
+    "better-gifts.send-order",
+    "better-item-view.show-drop-rates",
+    "better-marketplace.search-all",
+    "better-marketplace.show-chart-images",
+    "better-mice.show-attraction-rates",
+    "better-quests.m400-helper",
+    "better-send-supplies.pinned-items",
+    "better-tournaments.time-inline",
+    "better-travel.default-to-simple-travel",
+    "better-travel.show-alphabetized-list",
+    "debug.all",
     "debug.dialog",
+    "debug.events",
+    "debug.module-loading",
     "debug.navigation",
     "debug.request",
-    "debug.events"
+    "debug.utils-data",
+    "debug",
+    "error-reporting",
+    "hide-codices",
+    "hide-daily-reward-popup",
+    "hide-news-ticker",
+    "inline-wiki",
+    "inventory-only-open-multiple",
+    "journal-privacy.show-toggle-icon",
+    "journal-privacy",
+    "larger-codices",
+    "lgs-reminder.new-style",
+    "no-footer",
+    "no-share",
+    "no-sidebar",
+    "quick-send-supplies.items",
+    "taller-windows",
+    "ultimate-checkmark.show"
   ],
   "icons": [
     {

src/extension/popup.html

@@ -41,10 +41,10 @@ <h1>MouseHunt Improved</h1>
   </header>
   <main>
     <ul>
-      <li><a href="https://www.mousehuntgame.com/preferences.php?tab=mousehunt-improved-settings" target="_blank">Settings</a></li>
-      <li><a href="https://github.com/MHCommunity/mousehunt-improved/releases" target="_blank">Changelog</a></li>
-      <li><a href="https://github.com/MHCommunity/mousehunt-improved" target="_blank">GitHub</a></li>
-      <li><a href="https://github.com/MHCommunity/mousehunt-improved/issues" target="_blank">Report an issue</a></li>
+      <li><a href="https://www.mousehuntgame.com/preferences.php?tab=mousehunt-improved-settings" target="_blank" rel="noopener noreferrer">Settings</a></li>
+      <li><a href="https://github.com/MHCommunity/mousehunt-improved/releases" target="_blank" rel="noopener noreferrer">Changelog</a></li>
+      <li><a href="https://github.com/MHCommunity/mousehunt-improved" target="_blank" rel="noopener noreferrer">GitHub</a></li>
+      <li><a href="https://github.com/MHCommunity/mousehunt-improved/issues" target="_blank" rel="noopener noreferrer">Report an issue</a></li>
     </ul>
   </main>
 </body>

src/index.js

@@ -26,7 +26,7 @@ const modules = imported;
 const loadModules = async () => {
   const categories = [
     { id: 'required', name: 'Always Loaded' },
-    { id: 'better', name: 'MouseHunt Improved' },
+    { id: 'better', name: `MouseHunt Improved <span class="version">v${mhImprovedVersion}</span>` },
     { id: 'feature', name: 'Features' },
     { id: 'design', name: 'Design' },
     { id: 'element-hiding', name: 'Hide Page Elements' },
@@ -114,7 +114,7 @@ const loadModules = async () => {
     }
 
     // Log the loaded modules for the category.
-    debuglog('module-loading', `Loaded ${category.modules.length} ${category.name} modules`, loadedModules);
+    debuglog('module-loading', `Loaded ${category.modules.length} ${category.id} modules`, loadedModules);
   }
 
   // Wait for all modules to load.

src/modules/adblock/styles.css

@@ -6,7 +6,6 @@
 .journalactions a[data-share-type="journal"],
 .journalactions a[data-type="journal"],
 .mousehuntHeaderView-gameBanner,
-.mousehuntHeaderView-newsTicker,
 .pageSidebarView .fb-page,
 .socialLink,
 .newsPostFacebookContainer,

src/modules/better-gifts/settings/index.js

@@ -64,7 +64,7 @@ export default async () => {
     },
     {
       id: 'better-gifts.ignore-bad-gifts',
-      title: 'Ignore gifts that aren\'t the Gift of the Day',
+      title: 'Ignore gifts',
       default: [skipBadGiftOptions[0]],
       description: '',
       settings: {

src/modules/better-gifts/styles.css

@@ -443,7 +443,6 @@ a.mousehuntActionButton.giftSelectorView-action-confirm span {
   border-color: #424242;
 }
 
-.mh-dark-mode .pageFrameView #mousehuntContainer.PageCamp .mh-improved-favorite-setups-button:hover,
 .mh-dark-mode .pageFrameView #mousehuntContainer.PageCamp .campPage-trap-statsContainer:hover {
   background-color: #494949;
 }

src/modules/better-inventory/index.js

@@ -53,7 +53,7 @@ const setOpenQuantityOnClick = (attempts = 0) => {
 /**
  * Add the open all button to the convertible items.
  */
-const addOpenAlltoConvertible = () => {
+const addOpenAllToConvertible = () => {
   const form = document.querySelector('.convertible .itemView-action-convertForm');
   if (! form) {
     return;
@@ -68,7 +68,7 @@ const addOpenAlltoConvertible = () => {
   // get the innerHTML and split it on the input tag. then wrap the second match in a span so we can target it
   const formHTML = form.innerHTML;
   const formHTMLArray = formHTML.split(' /');
-  // if we dont have a second match, just return
+  // if we don't have a second match, just return
   if (! formHTMLArray[1]) {
     return;
   }
@@ -162,19 +162,19 @@ const main = () => {
     setOpenQuantityOnClick();
   }
 
-  addOpenAlltoConvertible();
+  addOpenAllToConvertible();
   addItemViewPopupToCollectibles();
   addArmButtonToCharms();
 
   onNavigation(() => {
-    addOpenAlltoConvertible();
+    addOpenAllToConvertible();
     addItemViewPopupToCollectibles();
     addArmButtonToCharms();
   }, {
     page: 'inventory',
   });
 
-  onEvent('js_dialog_show', addOpenAlltoConvertible);
+  onEvent('js_dialog_show', addOpenAllToConvertible);
 
   recipes();
 };

src/modules/better-inventory/recipes.js

@@ -1,4 +1,6 @@
 import {
+  cacheGet,
+  cacheSet,
   getCurrentSubtab,
   getCurrentTab,
   getUserItems,
@@ -148,6 +150,10 @@ const modifySmashableTooltip = async () => {
       return;
     }
 
+    item.addEventListener('mouseleave', () => {
+      item.classList.remove('new-tooltip-loading');
+    });
+
     item.addEventListener('mouseenter', async () => {
       if (item.getAttribute('data-new-tooltip') === 'newTooltip') {
         return;
@@ -160,7 +166,14 @@ const modifySmashableTooltip = async () => {
       const itemType = item.getAttribute('data-item-type');
       producedItem.push(itemType);
 
-      const itemData = await getUserItems(producedItem);
+      item.classList.add('new-tooltip-loading');
+
+      let itemData = await cacheGet(`smashable-${producedItem.join('-')}`);
+      if (! itemData) {
+        itemData = await getUserItems(producedItem);
+        cacheSet(`smashable-${producedItem.join('-')}`, itemData);
+      }
+
       if (! itemData || ! itemData[0]) {
         return;
       }
@@ -211,6 +224,8 @@ const modifySmashableTooltip = async () => {
       });
 
       tooltip.parentNode.insertBefore(tooltipWrapper, tooltip.nextSibling);
+
+      item.classList.remove('new-tooltip-loading');
     });
   });
 };
@@ -288,6 +303,12 @@ export default async () => {
     subtab: 'recipe',
   });
 
+  onNavigation(modifySmashableTooltip, {
+    page: 'inventory',
+    tab: 'crafting',
+    subtab: 'hammer',
+  });
+
   onEvent('js_dialog_show', warnOnBadCrafts);
 
   modifySmashableTooltip();

src/modules/better-inventory/styles/styles.css

@@ -90,15 +90,9 @@
   font-size: 9px;
 }
 
-.mousehuntHud-page-subTabContent.hammer .inventoryPage-item-margin.clear-block {
-  border: none;
-  border-radius: 0;
-}
-
 .mousehuntHud-page-subTabContent.hammer .inventoryPage-item:hover .inventoryPage-item-margin {
   background-color: #e3e3e3;
-  outline: 1px solid #888;
-  box-shadow: none;
+  border-color: #c9c9c9;
 }
 
 .mousehuntHud-page-subTabContent.hammer .inventoryPage-item .tooltip,
@@ -107,9 +101,25 @@
 }
 
 .mousehuntHud-page-subTabContent.hammer .inventoryPage-item:hover .newTooltip {
+  left: 50%;
   display: flex;
+  gap: 10px;
   align-items: center;
+  justify-content: center;
   width: auto;
+  min-width: 100px;
+  padding: 0;
+  border: none;
+  transform: translateX(-50%);
+}
+
+.mousehuntHud-page-subTabContent.hammer .inventoryPage-item:hover .newTooltip .inventoryPage-item-margin {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background-color: transparent;
+  border: none;
+  box-shadow: none;
 }
 
 .mousehuntHud-page-subTabContent.hammer .inventoryPage-item:hover .tooltip .inventoryPage-item-margin {
@@ -262,9 +272,15 @@ input.inventoryPage-tagDirectory-searchBar-input {
 .inventoryPage-item.torn_page input.viewFront,
 .inventoryPage-item.torn_page input.viewBack {
   display: inline-block;
-  padding: 3px 5px;
-  border-radius: 3px;
-  box-shadow: 1px 1px 4px #fff2aa inset;
+  padding: 2px 4px;
+  color: #000;
+  text-shadow: 0 0 1px #fff;
+  background-color: #f4e830;
+  border: 1px solid #000;
+  border-radius: 4px;
+  box-shadow:
+    0 -5px 8px -2px #ffae00 inset,
+    1px 1px 1px #eee;
 }
 
 .inventoryPage-craftingTable-title {
@@ -514,9 +530,23 @@ a.inventoryPage-item-larryLexicon.tsitu-lock-convertible {
 
 .inventoryPage-item.small .inventoryPage-item-margin {
   margin-bottom: 10px;
-  box-shadow: 0 4px 10px -10px #000;
+  box-shadow: 0 4px 10px -8px #000;
 }
 
 .mousehuntHud-page-subTabContent.trinket .mousehuntHud-page-subTabContent-prefix {
   display: none;
 }
+
+.new-tooltip-loading::after {
+  position: absolute;
+  inset: 0 0 10px;
+  content: "";
+  background:
+    url(https://www.mousehuntgame.com/images/ui/loaders/drip_spinner.gif?asset_cache_version=2) center no-repeat,
+    url(https://www.mousehuntgame.com/images/ui/backgrounds/overlay.png?asset_cache_version=2) 0 0 repeat;
+  border-radius: 10px;
+}
+
+.inventoryPage-item.small .tooltip {
+  padding: 10px;
+}

src/modules/better-item-view/index.js

@@ -1,13 +1,16 @@
 import {
   addStyles,
   getArForMouse,
+  getSetting,
   makeElement,
   makeLink,
   makeTooltip,
   onOverlayChange,
   onPageChange
 } from '@utils';
 
+import settings from './settings';
+
 import styles from './styles.css';
 
 /**
@@ -78,10 +81,14 @@ const updateItemView = async () => {
 
   addLinks(itemId);
 
-  // dont show drop rates for items that arent consistent.
+  if (! getSetting('better-item-view.show-drop-rates', true)) {
+    return;
+  }
+
+  // don't show drop rates for items that aren't consistent.
   const id = Number.parseInt(itemId, 10);
   const ignored = [
-    2473, // mina's gift
+    2473, // Mina's gift
     823, // party charm
     803, // chrome charm
     420, // king's credits
@@ -93,8 +100,8 @@ const updateItemView = async () => {
     return;
   }
 
-  let mhctjson = await getArForMouse(itemId, 'item');
-  if (! mhctjson || mhctjson === undefined) {
+  let mhctJson = await getArForMouse(itemId, 'item');
+  if (! mhctJson || mhctJson === undefined) {
     return;
   }
 
@@ -111,7 +118,7 @@ const updateItemView = async () => {
 
   makeTooltip({
     appendTo: titleText,
-    text: 'The best location and bait, according to data gathered by <a href="https://mhct.win/" target="_blank">MHCT</a>.',
+    text: 'The best location and bait, according to data gathered by <a href="https://mhct.win/" target="_blank" rel="noopener noreferrer">MHCT</a>.',
   });
 
   const link = makeElement('a', 'ar-link', 'View on MHCT →');
@@ -123,18 +130,18 @@ const updateItemView = async () => {
   const itemsArWrapper = makeElement('div', 'item-ar-wrapper');
 
   // check if there are stages in any of the item
-  const hasStages = mhctjson.some((itemAr) => itemAr.stage);
+  const hasStages = mhctJson.some((itemAr) => itemAr.stage);
 
   if (hasStages) {
     itemsArWrapper.classList.add('has-stages');
   }
 
-  // shrink the mhctjson array to only include items with non-zero drop rates and a maxiumum of 15 items
-  mhctjson = mhctjson
+  // shrink the mhct json array to only include items with non-zero drop rates and a maximum of 15 items
+  mhctJson = mhctJson
     .filter((itemAr) => Number.parseInt(itemAr.drop_pct, 10) > 0)
-    .slice(0, 15);
+    .slice(0, 10);
 
-  mhctjson.forEach((itemAr) => {
+  mhctJson.forEach((itemAr) => {
     const dropPercent = Number.parseInt(itemAr.drop_pct, 10).toFixed(2);
     if (dropPercent !== '0.00') {
       const itemArWrapper = makeElement('div', 'mouse-ar-wrapper');
@@ -152,7 +159,7 @@ const updateItemView = async () => {
     }
   });
 
-  if (mhctjson.length > 0) {
+  if (mhctJson.length > 0) {
     arWrapper.append(itemsArWrapper);
     container.append(arWrapper);
   }
@@ -174,4 +181,5 @@ export default {
   default: true,
   description: 'Updates the styles and shows drop rates, links to MHCT, and MH Wiki.',
   load: init,
+  settings,
 };