Fixing missing tooltips

45026831 · Jan 4, 2023 · ee68c4a · ee68c4a
1 parent 7ea64e3
commit ee68c4a
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 26 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,4 @@
+1.28.18: Fixing missing tooltips
 1.28.17: Pre-empting new tooltips update
 1.28.16: Pre-empting home screen timers update
 1.28.15: Fixing event girl shard counts on villain menu

diff --git a/dist/hh-plus-plus.dev.user.js b/dist/hh-plus-plus.dev.user.js
diff --git a/dist/hh-plus-plus.meta.js b/dist/hh-plus-plus.meta.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name Hentai Heroes++ BDSM version
 // @description Adding things here and there in the Hentai Heroes game. Also supports HHCore-based games such as GH and CxH.
-// @version 1.28.17
+// @version 1.28.18
 // @match https://*.hentaiheroes.com/*
 // @match https://nutaku.haremheroes.com/*
 // @match https://*.gayharem.com/*

diff --git a/dist/hh-plus-plus.user.js b/dist/hh-plus-plus.user.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "hh-plus-plus",
- "version": "1.28.17",
+ "version": "1.28.18",
  "description": "Adding things here and there in the Hentai Heroes game. Also supports HHCore-based games such as GH and CxH.",
  "private": "true",
  "scripts": {

diff --git a/src/config/index.js b/src/config/index.js
@@ -243,14 +243,14 @@ class Config {
 
  return `
  <div class="credits-contents">
- <p>You're running ${name} <a class="changelog" generic-tooltip="Click to open CHANGELOG" href="${CHANGELOG}" target="_blank">v${version}</a> by ${author}</p>
+ <p>You're running ${name} <a class="changelog" tooltip="Click to open CHANGELOG" href="${CHANGELOG}" target="_blank">v${version}</a> by ${author}</p>
  <p>Enjoying the script? Want to throw money at me for some reason? You can <a href="${BMAC}" target="_blank">Buy Me A Coffee</a> or <a href="${PATREON}" target="_blank">support me on Patreon</a> if you'd like.</p>
  <p>Join us on <a href="${DISCORD}" target="_blank">Discord</a>!</p>
  <h2>Special Thanks</h2>
  <div class="thanks-container">
  <div class="thanks-supporters">
  <h3>Patrons</h3>
- <ul class="script-supporters">${this.supporters.sort(sortSupporters).map(({name, tier}) => `<li class="script-supporter-${tier}">${name}${['gold', 'silver'].includes(tier) ? `<img class="tier-icon" src="${TIER_ICONS[tier]}" generic-tooltip="${tier.substring(0,1).toUpperCase()}${tier.substring(1)} Tier Supporter"/>` : '' }</li>`).join('')}</ul>
+ <ul class="script-supporters">${this.supporters.sort(sortSupporters).map(({name, tier}) => `<li class="script-supporter-${tier}">${name}${['gold', 'silver'].includes(tier) ? `<img class="tier-icon" src="${TIER_ICONS[tier]}" tooltip="${tier.substring(0,1).toUpperCase()}${tier.substring(1)} Tier Supporter"/>` : '' }</li>`).join('')}</ul>
  </div>
  <div class="thanks-code">
  <h3>Code Contributions</h3>

diff --git a/src/modules/BattleSimulatorModule/BDSMPvE.js b/src/modules/BattleSimulatorModule/BDSMPvE.js
@@ -59,10 +59,10 @@ class BDSMPvE {
  display (result) {
  const $matchRating = $(`<div class="matchRating ${result.scoreClass}">${I18n.nRounding(100*result.win, 2, -1)}%</div>`)
  if (result.impossible) {
- $matchRating.append(`<span class="short-circuit xUncheck_mix_icn" generic-tooltip="${this.label('impossible')}"></span>`)
+ $matchRating.append(`<span class="short-circuit xUncheck_mix_icn" tooltip="${this.label('impossible')}"></span>`)
  }
  if (result.guaranteed) {
- $matchRating.append(`<span class="short-circuit vCheck_mix_icn" generic-tooltip="${this.label('guaranteed')}"></span>`)
+ $matchRating.append(`<span class="short-circuit vCheck_mix_icn" tooltip="${this.label('guaranteed')}"></span>`)
  }
  $('#opponent-panel .average-lvl')
  .wrap('<div class="gridWrapper"></div>')

diff --git a/src/modules/BattleSimulatorModule/League.js b/src/modules/BattleSimulatorModule/League.js
@@ -144,7 +144,7 @@ class League {
  `<div class="matchRating-${key} ${className}"><span class="matchRating-label">${label}:</span><span class="matchRating-value">${value}</span></div>`
  ).join('')
 
- const $rating = $(`<div class="matchRating" style="color:${pointGrade[Math.round(expectedValue)]};" generic-tooltip="${probabilityTooltip}">${matchRatingHtml}</div>`)
+ const $rating = $(`<div class="matchRating" style="color:${pointGrade[Math.round(expectedValue)]};" tooltip="${probabilityTooltip}">${matchRatingHtml}</div>`)
  $('#leagues_right .average-lvl').wrap('<div class="gridWrapper"></div>').after($rating)
  $('.lead_table_default > td:nth-child(1) > div:nth-child(1) > div:nth-child(2) .level').append($rating)
  }

diff --git a/src/modules/FightAVillainModule/index.js b/src/modules/FightAVillainModule/index.js
@@ -118,7 +118,7 @@ class FightAVillainModule extends CoreModule {
  const $villainDrops = $('<div class="menu-villain-drops"></div>')
  if (gems) {
  gems.forEach(({element, amount}) => {
- $villainDrops.append(`<div class="menu-villain-gem-drop-container" generic-tooltip="${GT.design[`${element}_gem`]}"><img class="menu-villain-drop" src="${Helpers.getCDNHost()}/pictures/design/gems/${element}.png" /><span class="menu-villain-gem-drop-amount">${amount}</span></div>`)
+ $villainDrops.append(`<div class="menu-villain-gem-drop-container" tooltip="${GT.design[`${element}_gem`]}"><img class="menu-villain-drop" src="${Helpers.getCDNHost()}/pictures/design/gems/${element}.png" /><span class="menu-villain-gem-drop-amount">${amount}</span></div>`)
  })
  }
  if (items) {

diff --git a/src/modules/ResourceBarsModule/index.js b/src/modules/ResourceBarsModule/index.js
@@ -310,7 +310,7 @@ class ResourceBarsModule extends CoreModule {
 
  const $barHTML = $(`
  <a class="script-pop-timer" href="/activities.html?tab=pop">
- <div class="hh_bar" ${inProgress ? `generic-tooltip="${this.label('readyAt', { time: formattedDate })}"` : ''}>
+ <div class="hh_bar" ${inProgress ? `tooltip="${this.label('readyAt', { time: formattedDate })}"` : ''}>
  <div class="backbar borderbar">
  <div class="frontbar ${inProgress ? 'pinkbar' : 'bluebar'}" style="width: ${barWidth}%"></div>
  </div>
@@ -361,7 +361,7 @@ class ResourceBarsModule extends CoreModule {
  data.expiry = endAt - server_now_ts
  const formattedDate = new Date(endAt * 1000).toLocaleTimeString(I18n.getLang(), { hour: '2-digit', minute: '2-digit' }).replace(/(\d)/g, (x) => `${x}<i></i>`)
  return $(`
- <div class="slot ${rarity}" id_item="${id_item}" data-d="${JSON.stringify(data).replace(/"/g, '&quot;')}" additional-tooltip-info="${JSON.stringify({ additionalText: `<span class="script-tooltip"></span>${this.label('endAt', { time: formattedDate })}` }).replace(/"/g, '&quot;')}">
+ <div class="slot ${rarity}" id_item="${id_item}" booster-item-tooltip data-d="${JSON.stringify(data).replace(/"/g, '&quot;')}" additional-tooltip-info="${JSON.stringify({ additionalText: `<span class="script-tooltip"></span>${this.label('endAt', { time: formattedDate })}` }).replace(/"/g, '&quot;')}">
  <img src="${ico || `${Helpers.getCDNHost()}/pictures/items/${identifier}.png`}"/>
  </div>`)
  }
@@ -371,7 +371,7 @@ class ResourceBarsModule extends CoreModule {
  return '<div class="slot mythic empty"></div>'
  }
  return $(`
- <div class="slot mythic" id_item="${id_item}" data-d="${JSON.stringify(data).replace(/"/g, '&quot;')}" additional-tooltip-info="${JSON.stringify({ additionalText: '<span class="script-tooltip"></span>' }).replace(/"/g, '&quot;')}">
+ <div class="slot mythic" id_item="${id_item}" booster-item-tooltip data-d="${JSON.stringify(data).replace(/"/g, '&quot;')}" additional-tooltip-info="${JSON.stringify({ additionalText: '<span class="script-tooltip"></span>' }).replace(/"/g, '&quot;')}">
  <img src="${ico || `${Helpers.getCDNHost()}/pictures/items/${identifier}.png`}"/>
  </div>
  `)