Skip to content

Commit

Permalink
Adding style tweak to make the new resource summary more compact. Add…
Browse files Browse the repository at this point in the history
…ing PSH world 9 data.
  • Loading branch information
Numbers committed Jan 25, 2023
1 parent 532edb5 commit d62697e
Show file tree
Hide file tree
Showing 16 changed files with 198 additions and 56 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
1.31.0: Adding style tweak to make the new resource summary more compact. Adding PSH world 9 data.
1.30.3: Fixing resource bars on mobile
1.30.2: Fixing resource bars after 25/01 update
1.30.1: Fixing bug where flairs would disappear when sorting the league table, pre-empting addition of resource summary button in resource bars module (fix for position of level indicator will have to happen after it goes live)
Expand Down
51 changes: 42 additions & 9 deletions dist/hh-plus-plus.dev.user.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/hh-plus-plus.meta.js
Original file line number Diff line number Diff line change
@@ -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.30.3
// @version 1.31.0
// @match https://*.hentaiheroes.com/*
// @match https://nutaku.haremheroes.com/*
// @match https://*.gayharem.com/*
Expand Down
82 changes: 41 additions & 41 deletions dist/hh-plus-plus.user.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hh-plus-plus",
"version": "1.30.3",
"version": "1.31.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": {
Expand Down
15 changes: 14 additions & 1 deletion src/data/Villains.js
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,10 @@ export default {
}]
},
{
key: 'jamiebrooks',
world: 9,
girls: {
1: [],
1: ['191661045', '369105612', '665836932'],
2: [],
3: []
},
Expand All @@ -668,6 +669,18 @@ export default {
amount: 20,
}]
},
{
world: 10,
girls: {
1: [],
2: [],
3: []
},
gems: [{
element: 'fire',
amount: 20,
}]
},
],
HoH: [
{
Expand Down
3 changes: 2 additions & 1 deletion src/data/Worlds.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,6 @@ export const PSH = [
'biggerintexas',
'westcock',
'whenangelscum',
'suckramento'
'suckramento',
'friskyfresno',
]
1 change: 1 addition & 0 deletions src/i18n/labels/De.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ export const stConfig = {
seasonalEventTweaks: 'Optimierungen für Saisonales Event',
compactHaremFilters: 'Kompakte Haremfilter',
expandedMarketInventory: 'Erweitertes Marktinventar',
compactResourceSummary: 'Kompaktes Ressourcen-Inventar',
}

export const villain = {
Expand Down
3 changes: 3 additions & 0 deletions src/i18n/labels/En.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ export const stConfig = {
seasonalEventTweaks: 'Seasonal Event tweaks',
compactHaremFilters: 'Compact Harem filters',
expandedMarketInventory: 'Expanded Market inventory',
compactResourceSummary: 'Compact resource summary',
}

export const villain = {
Expand Down Expand Up @@ -163,6 +164,7 @@ export const villain = {
amiamiley: 'Amia Miley',
alyssareece: 'Alyssa Reece',
kellykline: 'Kelly Kline',
jamiebrooks: 'Jamie Brooks',
fallback: 'World {{world}} villain',
event: 'Event',
}
Expand Down Expand Up @@ -204,6 +206,7 @@ export const villainBreadcrumbs = {
westcock: 'West Cock',
whenangelscum: 'When Angels Cum',
suckramento: 'Welcome to Suckramento',
fiskyfresno: 'Frisky in Fresno',
}

export const market = {
Expand Down
1 change: 1 addition & 0 deletions src/i18n/labels/Es.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ export const stConfig = {
seasonalEventTweaks: 'Optimierungen für Saisonales Event',
compactHaremFilters: 'Filtros de harén compactos',
expandedMarketInventory: 'Ampliación del inventario de mercado',
compactResourceSummary: 'Inventario de recursos compacto',
}

export const villain = {
Expand Down
4 changes: 3 additions & 1 deletion src/i18n/labels/Fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ export const stConfig = {
seasonalEventTweaks: 'Modifications pour les Evènements Saisonniers',
compactHaremFilters: 'Filtres de harem compacts',
expandedMarketInventory: 'Inventaire du marché élargi',
compactResourceSummary: 'Inventaire de ressources compact',
}

export const villain = {
Expand Down Expand Up @@ -311,7 +312,8 @@ export const villainBreadcrumbs = {
biggerintexas: 'Plus GROS au Texas',
westcock: 'Con Ouest',
whenangelscum: 'Quand les anges montent au septième ciel',
suckramento: 'Bienvenue à Fiakramento'
suckramento: 'Bienvenue à Fiakramento',
fiskyfresno: 'Des folies à Fresno',
}

export const blessingSpreadsheetLink = {
Expand Down
1 change: 1 addition & 0 deletions src/i18n/labels/It.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ export const stConfig = {
seasonalEventTweaks: 'Ottimizzazioni per l\'evento stagionale',
compactHaremFilters: 'Filtri del Harem Compatti',
expandedMarketInventory: 'Inventario del mercato allargato',
compactResourceSummary: 'Inventario compatto delle risorse',
}

export const villain = {
Expand Down
35 changes: 35 additions & 0 deletions src/modules/CompactResourceSummaryStyleTweak/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import STModule from '../STModule'
import Helpers from '../../common/Helpers'
import I18n from '../../i18n'

import styles from './styles.lazy.scss'

const MODULE_KEY = 'compactResourceSummary'

class CompactResourceSummaryStyleTweak extends STModule {
constructor () {
const configSchema = ({
baseKey: MODULE_KEY,
label: I18n.getModuleLabel('stConfig', MODULE_KEY),
default: true
})
super({
configSchema,
styles
})
}

shouldRun () {
return true
}

run (props) {
super.run(props)

Helpers.defer(() => {
// window.number_reduce = (n) => I18n.nThousand(+n)
})
}
}

export default CompactResourceSummaryStyleTweak
50 changes: 50 additions & 0 deletions src/modules/CompactResourceSummaryStyleTweak/styles.lazy.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#hero_resources_popup {
.hero-resources-container {
display: grid;
grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
grid-gap: 0.5rem 3rem;

.hero-energies-container,
.hero-gems-container,
.hero-orbs-container {
grid-column-start: 1;
grid-column-end: 9;
}

.hero-currencies-container {
grid-column-start: 1;
grid-column-end: 6;
}

.hero-progressions-container {
grid-column-start: 6;
grid-column-end: 9;
grid-row-start: 2;
grid-row-end: 2;
}

.hero-currencies-container > div .hero-currency,
.hero-gems-container > div .hero-gem,
.hero-orbs-container > div .hero-orb,
.hero-progressions-container > div .hero-progression {
height: 2.5rem;
width: 6rem;
padding: 0;
}

.hero-energies-container > div.hero-energies .hero-energy {
margin-bottom: 0.5rem;
}

.hero-currencies-container > div,
.hero-gems-container > div,
.hero-orbs-container > div,
.hero-progressions-container > div {
justify-content: space-between;
}

#hero_resources_popup .hero-resources-container .hero-energies-container > div.hero-energies {
padding-top: 0.5rem;
}
}
}
1 change: 1 addition & 0 deletions src/modules/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,4 @@ export {default as CompactLossScreenStyleTweak} from './CompactLossScreenStyleTw
export {default as SeasonalEventStyleTweak} from './SeasonalEventStyleTweak'
export {default as CompactHaremFiltersStyleTweak} from './CompactHaremFiltersStyleTweak'
export {default as ExpandedMarketInventoryStyleTweak} from './ExpandedMarketInventoryStyleTweak'
export {default as CompactResourceSummaryStyleTweak} from './CompactResourceSummaryStyleTweak'

0 comments on commit d62697e

Please sign in to comment.