diff --git a/Frontend/src/lib/components/GeneratorShop.svelte b/Frontend/src/lib/components/GeneratorShop.svelte index 9e39006..3521246 100644 --- a/Frontend/src/lib/components/GeneratorShop.svelte +++ b/Frontend/src/lib/components/GeneratorShop.svelte @@ -2,6 +2,7 @@ import { scale } from 'svelte/transition'; import { quintOut } from 'svelte/easing'; import { game } from '$lib/stores/game.svelte'; + import { generatorEffectiveProduction } from '$lib/core/economy'; import { formatNumber } from '$lib/utils/formatNumber'; import CollapsiblePanel from './CollapsiblePanel.svelte'; @@ -14,12 +15,14 @@ {#each game.state.generators as gen, i} {@const cost = game.generatorCostWithTree(gen)} {@const canAfford = game.state.resources >= cost} - {@const currentProd = gen.baseProduction * gen.owned} + {@const effectiveProd = generatorEffectiveProduction(gen, game.state)} + {@const nextUnitProd = generatorEffectiveProduction({ ...gen, owned: 1 }, game.state)} + {@const share = game.productionPerSecond > 0 ? (effectiveProd / game.productionPerSecond * 100) : 0}
-
+
{gen.name} {#if gen.owned > 0} @@ -31,12 +34,19 @@ {/if}
- - +{gen.baseProduction}/s - {#if gen.owned > 0} - · {formatNumber(currentProd)}/s - {/if} - + {#if gen.owned > 0} +
+ {formatNumber(effectiveProd)}/s + · + {share.toFixed(0)}% +
+ +
+
+
+ {:else} + +{formatNumber(nextUnitProd)}/s par unite + {/if}