profectus/Profectus-Demo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Profectus 0.7 #1

Merged
thepaperpilot merged 110 commits from feat/board-feature-rewrite into main 2024-12-31 13:27:34 +00:00
Conversation 0 Commits 110 Files changed 148 +10 -16
3 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 3a69603031 - Show all commits

10
src/data/layers/prestige.tsx
View file

@ -5,20 +5,14 @@
import { main } from "data/projEntry"; import { main } from "data/projEntry";
import { createCumulativeConversion } from "features/conversion"; import { createCumulativeConversion } from "features/conversion";
import { createHotkey } from "features/hotkey"; import { createHotkey } from "features/hotkey";
import { bonusAmountMixin } from "mixins/bonusDecorator";
import { createRepeatable } from "features/clickables/repeatable";
import { createReset } from "features/reset"; import { createReset } from "features/reset";
import MainDisplay from "features/resources/MainDisplay.vue"; import MainDisplay from "features/resources/MainDisplay.vue";
import { createResource } from "features/resources/resource"; import { createResource } from "features/resources/resource";
import { addTooltip } from "wrappers/tooltips/tooltip";
import { createResourceTooltip } from "features/trees/tree"; import { createResourceTooltip } from "features/trees/tree";
import { createUpgrade } from "features/clickables/upgrade";
import { BaseLayer, createLayer } from "game/layers"; import { BaseLayer, createLayer } from "game/layers";
import { noPersist, persistent } from "game/persistence";
import { createCostRequirement } from "game/requirements";
import type { DecimalSource } from "util/bignum"; import type { DecimalSource } from "util/bignum";
import { render, renderCol, renderRow } from "util/vue"; import { render } from "util/vue";
import { computed } from "vue"; import { addTooltip } from "wrappers/tooltips/tooltip";
import { createLayerTreeNode, createResetButton } from "../common"; import { createLayerTreeNode, createResetButton } from "../common";
const id = "p"; const id = "p";

8
src/features/clickables/clickable.tsx
View file

@ -67,10 +67,14 @@ export function createClickable<T extends ClickableOptions>(optionsFunc?: () =>
<span> <span>
{_display.title != null ? ( {_display.title != null ? (
<div> <div>
{render(_display.title, el => <h3>{el}</h3>)} {render(_display.title, el => (
<h3>{el}</h3>
))}
</div> </div>
) : null} ) : null}
{render(_display.description, el => <div>{el}</div>)} {render(_display.description, el => (
<div>{el}</div>
))}
</span> </span>
); );
} else if (_display != null) { } else if (_display != null) {

8
src/util/vue.tsx
View file

@ -89,15 +89,11 @@ export function render(
return wrapper?.(object) ?? object; return wrapper?.(object) ?? object;
} }
export function renderRow( export function renderRow(...objects: (VueFeature | MaybeGetter<Renderable>)[]): JSX.Element {
...objects: (VueFeature | MaybeGetter<Renderable>)[]
): JSX.Element {
return <Row>{objects.map(obj => render(obj))}</Row>; return <Row>{objects.map(obj => render(obj))}</Row>;
} }
export function renderCol( export function renderCol(...objects: (VueFeature | MaybeGetter<Renderable>)[]): JSX.Element {
...objects: (VueFeature | MaybeGetter<Renderable>)[]
): JSX.Element {
return <Col>{objects.map(obj => render(obj))}</Col>; return <Col>{objects.map(obj => render(obj))}</Col>;
} }