Adding modules to show clubmates and script Patreon supporters on lea…

…derboards (league, contests, season, pantheon, pov, pog)

CHANGELOG

@@ -1,3 +1,4 @@
+1.29.0: Adding modules to show clubmates and script Patreon supporters on leaderboards (league, contests, season, pantheon, pov, pog)
 1.28.24: Annotating Season, Pantheon and Po* leaderboards with player IDs (enabler for future modules)
 1.28.23: Enabling pantheon script features on CxH
 1.28.22: Fixing some missing icons, fixing pantheon leaderboard now that it's the same as Po*, improving simulator logging, fixing monthly card text tweak for the new icons

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.24
+// @version 1.29.0
 // @match https://*.hentaiheroes.com/*
 // @match https://nutaku.haremheroes.com/*
 // @match https://*.gayharem.com/*

package.json

@@ -1,6 +1,6 @@
 {
  "name": "hh-plus-plus",
- "version": "1.28.24",
+ "version": "1.29.0",
  "description": "Adding things here and there in the Hentai Heroes game. Also supports HHCore-based games such as GH and CxH.",
  "private": "true",
  "scripts": {

src/common/Helpers.js

@@ -10,6 +10,7 @@ let isNutakuKobans
 let cdnHost
 let girlDictionary
 let teamsDictionary
+let platform
 
 const deferred = []
 
@@ -94,6 +95,22 @@ class Helpers {
  }
  }
 
+ static getPlatform () {
+ if (!platform) {
+ const host = Helpers.getHost()
+ if (host.includes('nutaku')) {
+ platform = 'nutaku'
+ } else if (host.includes('erogames')) {
+ platform = 'erogames'
+ } else if (host.includes('thrixxx')) {
+ platform = 'thrixxx'
+ } else {
+ platform = '.com'
+ }
+ }
+ return platform
+ }
+
  static isNutakuKobans () {
  if (typeof isNutakuKobans === 'undefined') {
  isNutakuKobans = HH_UNIVERSE === 'nutaku'

src/common/TableAnnotation.js

@@ -24,7 +24,7 @@ class TableAnnotation {
  Helpers.doWhenSelectorAvailable(`${selector} .leaderboard_row`, () => {
  const $leaderboardList = $(selector)
 
- $leaderboardList.find('.leaderboard_row:not(.build-at-bottom)').each((i, el) => {
+ $leaderboardList.find('.leaderboard_row:not(.build-at-bottom):not(.script-season-leaderboard-fix)').each((i, el) => {
  $(el).attr('sorting_id', leaderboard[i].id_member)
  })
 

src/i18n/labels/De.js

@@ -65,6 +65,7 @@ export const config = {
  eventEndIndicators: 'Anzeige für Eventende auf dem Startbildschirm',
  haremTeamsFilter: 'Teamfilter für Harem',
  upgradeQuickNav: 'Schnellnavigation auf der Upgrade-Seite',
+ leaderboardClubmateIndicators: 'Club-Mitglieder auf Ranglisten hervorheben',
 }
 export const stConfig = {
  missionsBackground: 'Missionshintergrund ändern',
@@ -290,3 +291,7 @@ export const haremTeamsFilter = {
  team: 'Team',
  visitTeams: 'Besuche zuerst die <a href="../teams.html">Teams</a>.',
 }
+
+export const leaderboardClubmateIndicators = {
+ clubmate: 'Club-Mitglieder',
+}

src/i18n/labels/En.js

@@ -81,6 +81,7 @@ export const config = {
  eventEndIndicators: 'Event ending indicators on home screen',
  haremTeamsFilter: 'Harem teams filter',
  upgradeQuickNav: 'Upgrade page quick navigation',
+ leaderboardClubmateIndicators: 'Highlight clubmates on leaderboards',
 }
 export const stConfig = {
  missionsBackground: 'Change missions background',
@@ -358,3 +359,7 @@ export const haremTeamsFilter = {
  team: 'Team',
  visitTeams: 'Visit <a href="../teams.html">Teams</a> first.',
 }
+
+export const leaderboardClubmateIndicators = {
+ clubmate: 'Clubmate',
+}

src/i18n/labels/Es.js

@@ -86,6 +86,7 @@ export const config = {
  eventEndIndicators: 'Indicadores de finalización de evento en la pantalla de inicio',
  haremTeamsFilter: 'Filtro de equipos de harén',
  upgradeQuickNav: 'Navegación rápida en la página de actualización',
+ leaderboardClubmateIndicators: 'Destacar a los compañeros de club en las tablas de clasificación',
 }
 export const stConfig = {
  missionsBackground: 'Cambiar el fondo de las misiones',
@@ -313,3 +314,7 @@ export const haremTeamsFilter = {
  team: 'Equipo',
  visitTeams: 'Visita el <a href="../teams.html">Equipos</a> primero.'
 }
+
+export const leaderboardClubmateIndicators = {
+ clubmate: 'Compañero de club',
+}

src/i18n/labels/Fr.js

@@ -76,6 +76,7 @@ export const config = {
  eventEndIndicators: 'Indicateurs de fin d\'évènement sur la page d\'accueil',
  haremTeamsFilter: 'Filtre d\'équipes dans le harem',
  upgradeQuickNav: 'Navigation rapide sur la page d\'amélioration',
+ leaderboardClubmateIndicators: 'Surligner les coéquipiers dans les classements',
 }
 export const stConfig = {
  missionsBackground: 'Change l\'arrière-plan des missions',
@@ -320,3 +321,7 @@ export const haremTeamsFilter = {
  team: 'Équipe',
  visitTeams: 'Visiter d\'abord <a href="../teams.html">l\'équipe</a>.',
 }
+
+export const leaderboardClubmateIndicators = {
+ clubmate: 'Coéquipier',
+}

src/i18n/labels/It.js

@@ -91,6 +91,7 @@ export const config = {
  eventEndIndicators: 'Mostra per la fine dell\'evento nella schermata iniziale',
  haremTeamsFilter: 'Filtro squadra per harem',
  upgradeQuickNav: 'Navigazione rapida sulla pagina di aggiornamento',
+ leaderboardClubmateIndicators: 'Evidenziare i soci del club nelle classifiche',
 }
 export const stConfig = {
  missionsBackground: 'Cambiare lo sfondo delle missioni',
@@ -319,3 +320,7 @@ export const haremTeamsFilter = {
  team: 'Squadra',
  visitTeams: 'Visita le <a href="../teams.html">Squadre</a> prima.'
 }
+
+export const leaderboardClubmateIndicators = {
+ clubmate: 'Soci del club',
+}

src/index.js

@@ -16,6 +16,7 @@ import Helpers from './common/Helpers'
 import TableAnnotation from './common/TableAnnotation'
 import Config from './config'
 import * as modules from './modules'
+import LeaderboardSupportersIndicatorsModule from './modules/LeaderboardSupportersIndicatorsModule'
 
 const runScript = () => {
  const config = new Config()
@@ -36,6 +37,8 @@ const runScript = () => {
 
  TableAnnotation.run()
 
+ new LeaderboardSupportersIndicatorsModule().run()
+
  // configurable modules
 
  // core

src/modules/LeaderboardClubmateIndicatorsModule/index.js

@@ -0,0 +1,63 @@
+import CoreModule from '../CoreModule'
+import Helpers from '../../common/Helpers'
+import I18n from '../../i18n'
+
+import styles from './styles.lazy.scss'
+import { lsKeys } from '../../common/Constants'
+
+const MODULE_KEY = 'leaderboardClubmateIndicators'
+
+class LeaderboardClubmateIndicatorsModule extends CoreModule {
+ constructor () {
+ super({
+ baseKey: MODULE_KEY,
+ label: I18n.getModuleLabel('config', MODULE_KEY),
+ default: true
+ })
+ this.label = I18n.getModuleLabel.bind(this, MODULE_KEY)
+ }
+
+ shouldRun () {
+ return ['activities', 'tower-of-fame', 'pantheon', 'season.html', 'path-of-valor', 'path-of-glory'].some(page => Helpers.isCurrentPage(page))
+ }
+
+ run () {
+ if (this.hasRun || !this.shouldRun()) {return}
+
+ styles.use()
+
+ Helpers.defer(() => {
+ if (['activities', 'tower-of-fame'].some(page => Helpers.isCurrentPage(page))) {
+ this.addClubmateAnnotations()
+ }
+ })
+
+ $(document).on('leaderboard-annotated', (event, data) => this.addClubmateAnnotations(data))
+
+ this.hasRun = true
+ }
+
+ async addClubmateAnnotations (data) {
+ const selector = (data && data.selector) || ''
+ const clubStatus = Helpers.lsGet(lsKeys.CLUB_STATUS)
+ const nameColumnSelector = this.getNameColumnSelector()
+
+ if (clubStatus && clubStatus.memberIds) {
+ clubStatus.memberIds.forEach((id) => {
+ if (id === `${window.Hero.infos.id}`) {return}
+ $(`${selector} [sorting_id='${id}']`).find(nameColumnSelector).append(`<div class="script-flair script-clubmate"><span class="globalClubs_mix_icn" tooltip="${this.label('clubmate')}"/></div>`)
+ })
+ }
+ }
+
+ getNameColumnSelector () {
+ if (Helpers.isCurrentPage('activities')) {
+ return 'td:nth-of-type(2)'
+ } else if (Helpers.isCurrentPage('tower-of-fame')) {
+ return '.nickname'
+ }
+ return '> div:nth-of-type(2)'
+ }
+}
+
+export default LeaderboardClubmateIndicatorsModule

src/modules/LeaderboardClubmateIndicatorsModule/styles.lazy.scss

@@ -0,0 +1,9 @@
+.script-flair.script-clubmate {
+ .globalClubs_mix_icn {
+ margin: 0;
+ margin-left: 5px;
+ height: 21px;
+ width: 21px;
+ background-size: contain;
+ }
+}

src/modules/LeaderboardSupportersIndicatorsModule/index.js

@@ -0,0 +1,76 @@
+import CoreModule from '../CoreModule'
+import Helpers from '../../common/Helpers'
+import I18n from '../../i18n'
+
+import tierIconGold from '../../assets/hh-plus-plus-gold.svg'
+import tierIconSilver from '../../assets/hh-plus-plus-silver.svg'
+
+import styles from './styles.lazy.scss'
+import Supporters from '../../data/Supporters'
+
+const MODULE_KEY = 'leaderboardSupportersIndicators'
+
+const TIER_ICONS = {
+ gold: tierIconGold,
+ silver: tierIconSilver,
+}
+
+class LeaderboardSupportersIndicatorsModule extends CoreModule {
+ constructor () {
+ super({
+ baseKey: MODULE_KEY,
+ default: true
+ })
+ this.label = I18n.getModuleLabel.bind(this, MODULE_KEY)
+ }
+
+ shouldRun () {
+ return ['activities', 'tower-of-fame', 'pantheon', 'season.html', 'path-of-valor', 'path-of-glory'].some(page => Helpers.isCurrentPage(page))
+ }
+
+ run () {
+ if (this.hasRun || !this.shouldRun()) {return}
+
+ styles.use()
+
+ Helpers.defer(() => {
+ if (['activities', 'tower-of-fame'].some(page => Helpers.isCurrentPage(page))) {
+ this.addSupporterAnnotations()
+ }
+ })
+
+ $(document).on('leaderboard-annotated', (event, data) => this.addSupporterAnnotations(data))
+
+ this.hasRun = true
+ }
+
+ async addSupporterAnnotations (data) {
+ const selector = (data && data.selector) || ''
+ const supporters = await Supporters.getSupporters()
+ const filteredSupporters = supporters.filter(({flairs}) => flairs)
+
+ const gameKey = Helpers.getGameKey()
+ const gamePlatform = Helpers.getPlatform()
+
+ const nameColumnSelector = this.getNameColumnSelector()
+
+ filteredSupporters.forEach(({tier, flairs}) => {
+ flairs.forEach(({game, platform, id}) => {
+ if (game === gameKey && platform === gamePlatform) {
+ $(`${selector} [sorting_id='${id}']`).find(nameColumnSelector).append(`<div class="script-flair script-supporter"><img class="tier-icon" src="${TIER_ICONS[tier]}" tooltip="HH++ ${tier.substring(0,1).toUpperCase()}${tier.substring(1)} Tier Supporter"/></div>`)
+ }
+ })
+ })
+ }
+
+ getNameColumnSelector () {
+ if (Helpers.isCurrentPage('activities')) {
+ return 'td:nth-of-type(2)'
+ } else if (Helpers.isCurrentPage('tower-of-fame')) {
+ return '.nickname'
+ }
+ return '> div:nth-of-type(2)'
+ }
+}
+
+export default LeaderboardSupportersIndicatorsModule

src/modules/LeaderboardSupportersIndicatorsModule/styles.lazy.scss

@@ -0,0 +1,12 @@
+.script-flair {
+ display: inline-flex;
+ height: 100%;
+ flex-direction: column;
+ justify-content: center;
+
+ .tier-icon {
+ display: inline-block;
+ margin-left: 5px;
+ height: 21px;
+ }
+}

src/modules/ResourceBarsModule/styles.lazy.scss

@@ -484,11 +484,6 @@ body#hh_comix > div > header div[rel="xp"] {
  }
 }
 
-#contests > div > div.right_part img {
- height: 286px;
- margin-top: -74px;
-}
-
 @media #{$mediaMobile} {
  body > div > header {
  & > a.hh_logo,

src/modules/index.js

@@ -31,6 +31,7 @@ export {default as FixProfilePopupModule} from './FixProfilePopupModule'
 export {default as EventEndIndicatorsModule} from './EventEndIndicatorsModule'
 export {default as HaremTeamsFilterModule} from './HaremTeamsFilterModule'
 export {default as UpgradeQuickNavModule} from './UpgradeQuickNavModule'
+export {default as LeaderboardClubmateIndicatorsModule} from './LeaderboardClubmateIndicatorsModule'
 
 export {default as HomeScreenRightSideRearrangeStyleTweak} from './HomeScreenRightSideRearrangeStyleTweak'
 export {default as ContestNotifsStyleTweak} from './ContestNotifsStyleTweak'