Skip to content

Add stat breakdown to mining2 resources tooltip #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jarboo wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add stat breakdown to mining2 resources tooltip #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4ef7c0
Mining2 : added stat breakdown in Smoke tooltip
jarboo May 15, 2025
0f5a3dd
Mining2: added stat breakdown in all Gases tooltip
jarboo May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/components/partial/mining/Status.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,16 @@
</gb-tooltip>
</template>
<template v-else-if="subfeature === 1">
<v-chip v-if="smoke > 0" label class="balloon-text-dynamic ma-1" :class="$vuetify.theme.dark ? 'darken-2' : 'lighten-2'" :color="currency.mining_smoke.color">
<v-icon class="mr-2">{{ currency.mining_smoke.icon }}</v-icon>
<span>{{ $formatNum(smoke, true) }}</span>
</v-chip>
<gb-tooltip key="status-smoke" v-if="smoke > 0" :title-text="$vuetify.lang.t('$vuetify.currency.mining_smoke.name')">
<template v-slot:activator="{ on, attrs }">
<v-chip label class="balloon-text-dynamic ma-1" :class="$vuetify.theme.dark ? 'darken-2' : 'lighten-2'" :color="currency.mining_smoke.color" v-bind="attrs" v-on="on">
<v-icon class="mr-2">{{ currency.mining_smoke.icon }}</v-icon>
<span>{{ $formatNum(smoke, true) }}</span>
</v-chip>
</template>
<div class="text-center">{{ $vuetify.lang.t('$vuetify.gooboo.gain') }}</div>
<stat-breakdown :base="baseSmoke" name="currencyMiningSmokeGain"></stat-breakdown>
</gb-tooltip>
<template v-if="isDeepest">
<gb-tooltip v-for="(amount, gas) in gasses" :key="gas" :title-text="$vuetify.lang.t(`$vuetify.currency.mining_${ gas }.name`)">
<template v-slot:activator="{ on, attrs }">
Expand All @@ -140,6 +146,10 @@
<currency-icon :name="`mining_${gas}`"></currency-icon>
<span>{{ $vuetify.lang.t(`$vuetify.mining.gasGain.3`) }}</span>
</div>
<div class="text-center">{{ $vuetify.lang.t('$vuetify.gooboo.gain') }}</div>
<stat-breakdown :name="`currencyMining${ gas.charAt(0).toUpperCase() + gas.slice(1) }Gain`"></stat-breakdown>
<div class="text-center">{{ $vuetify.lang.t('$vuetify.mult.currencyMining' + gas.charAt(0).toUpperCase() + gas.slice(1) + 'Increment') }}</div>
<stat-breakdown :base="1" :name="`currencyMining${ gas.charAt(0).toUpperCase() + gas.slice(1) }Increment`"></stat-breakdown>
</gb-tooltip>
</template>
</template>
Expand Down Expand Up @@ -257,6 +267,7 @@ export default {
baseScrap: 'mining/currentBaseScrap',
ore: 'mining/currentOre',
smoke: 'mining/currentSmoke',
baseSmoke: 'mining/currentBaseSmoke',
gasses: 'mining/currentGas',
gasLimit: 'mining/currentGasLimit',
hitsNeeded: 'mining/hitsNeeded',
Expand Down
8 changes: 7 additions & 1 deletion src/store/mining.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,11 @@ export default {
graniteBreaksMult: (state, getters) => {
return Math.pow(2, Math.max(0, Math.floor(logBase(getters.currentBreaks + 1, 10)) - 3));
},
depthBaseSmoke: (state, getters, rootState) => (depth) => {
return (rootState.unlock.miningSmoke.use && depth >= 25 && rootState.system.features.mining.currentSubfeature === 1) ? Math.pow(1.05, depth - 25) * 0.01 : 0;
},
depthSmoke: (state, getters, rootState, rootGetters) => (depth) => {
return (rootState.unlock.miningSmoke.use && depth >= 25 && rootState.system.features.mining.currentSubfeature === 1) ? rootGetters['mult/get']('currencyMiningSmokeGain', Math.pow(1.05, depth - 25) * 0.01) : 0;
return (rootState.unlock.miningSmoke.use && depth >= 25 && rootState.system.features.mining.currentSubfeature === 1) ? rootGetters['mult/get']('currencyMiningSmokeGain', getters.depthBaseSmoke(depth)) : 0;
},
depthGasLimit: (state, getters, rootState, rootGetters) => (depth, gas) => {
return Math.round((depth + 1 - state.gas[gas]) * 100 * Math.pow(rootGetters['mult/get'](`currencyMining${ capitalize(gas) }Increment`, 1), depth - state.gas[gas]));
Expand Down Expand Up @@ -175,6 +178,9 @@ export default {
currentOre: (state, getters) => {
return getters.depthOre(state.depth);
},
currentBaseSmoke: (state, getters) => {
return getters.depthBaseSmoke(state.depth);
},
currentSmoke: (state, getters) => {
return getters.depthSmoke(state.depth);
},
Expand Down