Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f9763a9
guess which dumbass forgot to test his code (me)
HexaVault Oct 31, 2024
10d31b4
fix r143 reward desc
HexaVault Nov 2, 2024
710f195
Fix 2x IP not quite being right
HexaVault Mar 16, 2025
06f6951
Fix prestige runs container
HexaVault Mar 16, 2025
d97f8d2
Fix contrast colors not working sometimes
HexaVault Mar 16, 2025
902e87c
add comment
HexaVault Mar 16, 2025
e32a3df
swap two conditions around
HexaVault May 5, 2025
550b701
minor fix
HexaVault May 5, 2025
ab8b2fe
add a 5000 rm upgrade lock for synthetic symbolism
HexaVault Jan 13, 2026
ff5f035
too lazy to open vscode
HexaVault Mar 16, 2026
dcbd9f1
fix format
HexaVault Mar 16, 2026
09fedb3
more webhub stuff
HexaVault Mar 16, 2026
13b63d5
fix codefactor complaint (watch it find 4 more)
HexaVault Mar 16, 2026
8a06609
some Fixes
HexaVault Jun 7, 2026
6a79b78
more fixes
HexaVault Jun 7, 2026
afa2f22
sacrifice while enslaved
HexaVault Jun 7, 2026
a0f2515
codefactor
HexaVault Jun 7, 2026
36dc940
added note about enslaved disabling sacrifice
HexaVault Jun 7, 2026
c154e6d
fixes
HexaVault Jun 7, 2026
81848c5
dev changes, fix bad code, iu and sing text changes, ec6 while enslav…
HexaVault Jun 10, 2026
b1e8093
nc3 title fix
HexaVault Jun 11, 2026
ec31c9f
fix some codefactor
HexaVault Jun 11, 2026
1f3c04f
check for "infinity" props asw, and allow import(x) to actually work
HexaVault Jun 13, 2026
4db0176
drp now uses formatMachines, add pelle upgrades to AG reset text, up …
HexaVault Jun 16, 2026
393fd13
notation bug, sort out storage being overzealous with "broken" proper…
HexaVault Jun 16, 2026
b9049e2
fix undefined attempted during automator log
HexaVault Jun 16, 2026
e2cd0f8
fix spelling, r187 now correctly states dilating time, not unlocking …
HexaVault Jun 23, 2026
53a7280
only show animation note modal once, not showing if the game has been…
HexaVault Jun 23, 2026
37129b2
recenter nameless icon
HexaVault Jun 23, 2026
13780ed
fixed shiftclick showing ecs early
HexaVault Jun 23, 2026
e50ccb6
fix blind
HexaVault Jun 23, 2026
60e872c
set sidebar currency to currency 2 (antimatter) on reset, to prevent …
HexaVault Jun 23, 2026
63c2d10
fixed sacrifice boost not actually needing the ra unlock to function
HexaVault Jun 23, 2026
5bcfb95
fix UNTIL not checking higher in the stack, resulting in until <prest…
HexaVault Jun 23, 2026
269fa04
spelling
HexaVault Jun 23, 2026
4cc6496
fix tab capitalisation
HexaVault Jun 23, 2026
fa9f7ff
comments
HexaVault Jun 23, 2026
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
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
"max-len": [
"warn",
{
"code": 120
"code": 140
}
],
"max-params": "warn",
Expand Down
2 changes: 1 addition & 1 deletion public/stylesheets/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}

::-webkit-scrollbar-corner {
-webkit-appearance: none;

Check warning on line 21 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L21

Vendor-prefixed property "-webkit-appearance". (property-no-vendor-prefix)
appearance: none;
}

Expand Down Expand Up @@ -72,7 +72,7 @@
--color-bad: #b84b5f;
--color-gh-purple: #8957e5;
--color-notification: red;
--color-overlay: rgba(30, 30, 50, 70%);

Check warning on line 75 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L75

Expected "rgba" to be "rgb". (color-function-alias-notation)

--color-antimatter: #2196f3;
--color-infinity: #b67f33;
Expand Down Expand Up @@ -132,7 +132,7 @@
--color-disabled: #37474f;
--color-accent: #1256a3;
--color-notification: yellow;
--color-overlay: rgba(60, 60, 100, 50%);

Check warning on line 135 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L135

Expected "rgba" to be "rgb". (color-function-alias-notation)

--color-infinity: #ff9800;
--color-reality-dark: #0ba00e;
Expand All @@ -154,7 +154,7 @@
--color-good-dark: #2e7d32;
--color-bad: #e53935;
--color-notification: yellow;
--color-overlay: rgba(60, 60, 100, 50%);

Check warning on line 157 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L157

Expected "rgba" to be "rgb". (color-function-alias-notation)

--color-infinity: #ff9800;
--color-eternity: #673ab7;
Expand All @@ -176,7 +176,7 @@
--color-disabled: #2d2421;
--color-accent: #2fa6f7;
--color-notification: yellow;
--color-overlay: rgba(60, 60, 100, 50%);

Check warning on line 179 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L179

Expected "rgba" to be "rgb". (color-function-alias-notation)

--color-reality-dark: #0ba00e;
--color-prestige--accent: black;
Expand All @@ -194,7 +194,7 @@
--color-disabled: #2d2421;
--color-accent: #2fa6f7;
--color-notification: yellow;
--color-overlay: rgba(60, 60, 100, 50%);

Check warning on line 197 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L197

Expected "rgba" to be "rgb". (color-function-alias-notation)

--color-infinity: #ff9800;
--color-eternity: #673ab7;
Expand Down Expand Up @@ -248,7 +248,7 @@
--color-good: #2f9e35;
--color-good-dark: #08510b;
--color-notification: yellow;
--color-overlay: rgba(60, 60, 100, 50%);

Check warning on line 251 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L251

Expected "rgba" to be "rgb". (color-function-alias-notation)

--color-prestige--accent: black;

Expand All @@ -264,7 +264,7 @@
--color-base: black;
--color-accent: #fbc21b;
--color-notification: yellow;
--color-overlay: rgba(60, 60, 100, 50%);

Check warning on line 267 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L267

Expected "rgba" to be "rgb". (color-function-alias-notation)

--color-prestige--accent: black;

Expand Down Expand Up @@ -691,7 +691,7 @@
border: var(--var-border-width, 0.2rem) solid var(--color-accent);
border-radius: var(--var-border-radius, 0.4rem);
transition-duration: 0.2s;
-webkit-user-select: none;

Check warning on line 694 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L694

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
cursor: pointer;
}
Expand Down Expand Up @@ -916,7 +916,7 @@
background-color: #fdd3b0;
border: var(--var-border-width, 0.2rem) solid sandybrown;
border-radius: var(--var-border-radius, 0.5rem);
box-shadow: 0 0 2rem inset rgba(244, 164, 96, 50%);

Check warning on line 919 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L919

Expected "rgba" to be "rgb". (color-function-alias-notation)
margin-right: 0.5rem;
transition-duration: 0.2s;
}
Expand All @@ -926,7 +926,7 @@
}

[draggable] {
-webkit-user-select: none;

Check warning on line 929 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L929

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;

/* Required to make elements draggable in old WebKit */
Expand Down Expand Up @@ -1253,7 +1253,7 @@
@media print,
screen and (max-width: 720px) {
body {
word-wrap: break-word;

Check warning on line 1256 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L1256

Expected "word-wrap" to be "overflow-wrap". (property-no-deprecated)
}

header {
Expand Down Expand Up @@ -1542,7 +1542,7 @@
*******/

.c-game-ui {
overflow-x: hidden;

Check warning on line 1545 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L1545

Expected shorthand property "overflow". (declaration-block-no-redundant-longhand-properties)
overflow-y: auto;
width: 100%;
/* stylelint-disable-next-line unit-allowed-list */
Expand Down Expand Up @@ -2515,7 +2515,7 @@
font-size: 1.6rem;
color: black;
pointer-events: all;
-webkit-user-select: none;

Check warning on line 2518 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L2518

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down Expand Up @@ -2649,7 +2649,7 @@

.t-metro .c-infinity-dim-description__accent,
.t-s8 .c-infinity-dim-description__accent {
text-shadow: 0 0 0.1rem rgba(0, 0, 0, 50%), -0.1rem 0.1rem 0.1rem black;

Check warning on line 2652 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L2652

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

.t-dark .c-infinity-dim-description__accent,
Expand Down Expand Up @@ -2694,7 +2694,7 @@

.t-metro .c-time-dim-description__accent,
.t-s8 .c-time-dim-description__accent {
text-shadow: 0 0 0.1rem rgba(0, 0, 0, 50%), -0.1rem 0.1rem 0.1rem black;

Check warning on line 2697 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L2697

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

.t-dark .c-time-dim-description__accent,
Expand Down Expand Up @@ -2781,7 +2781,7 @@
}

.c-options-grid__notations {
-webkit-user-select: none;

Check warning on line 2784 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L2784

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down Expand Up @@ -2902,7 +2902,7 @@
flex-direction: row;
justify-content: center;
align-items: baseline;
-webkit-user-select: none;

Check warning on line 2905 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L2905

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
cursor: pointer;
}
Expand Down Expand Up @@ -3004,7 +3004,7 @@
border: var(--var-border-width, 0.2rem) solid;
border-radius: var(--var-border-radius, 0.8rem);
margin: 0 auto;
-webkit-user-select: none;

Check warning on line 3007 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L3007

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down Expand Up @@ -3264,7 +3264,7 @@
justify-content: center;
font-size: 1.5rem;
margin-top: 0.6rem;
-webkit-user-select: none;

Check warning on line 3267 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L3267

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down Expand Up @@ -3353,7 +3353,7 @@
justify-content: flex-start;
align-items: center;
margin: 0 1rem;
-webkit-user-select: none;

Check warning on line 3356 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L3356

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
cursor: pointer;
}
Expand Down Expand Up @@ -4101,7 +4101,7 @@
flex-direction: row;
justify-content: center;
align-items: center;
-webkit-user-select: none;

Check warning on line 4104 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L4104

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand All @@ -4119,7 +4119,7 @@
border-top-right-radius: var(--var-border-radius, 0.3rem);
border-bottom-left-radius: var(--var-border-radius, 1rem);
transition-duration: 0.2s;
-webkit-user-select: none;

Check warning on line 4122 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L4122

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
cursor: pointer;
}
Expand Down Expand Up @@ -4597,7 +4597,7 @@

.t-metro .c-replicanti-description__accent,
.t-s8 .c-replicanti-description__accent {
text-shadow: 0 0 0.1rem rgba(0, 0, 0, 50%), -0.1rem 0.1rem 0.1rem black;

Check warning on line 4600 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L4600

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

.t-dark .c-replicanti-description__accent,
Expand Down Expand Up @@ -4963,7 +4963,7 @@
.t-s8 .c-dilation-tab__dilated-time-income,
.t-s8 .c-dilation-tab__galaxy-threshold,
.t-s8 .c-dilation-tab__galaxies {
text-shadow: 0 0 0.1rem rgba(0, 0, 0, 50%), -0.1rem 0.1rem 0.1rem black;

Check warning on line 4966 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L4966

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

.t-metro .c-dilation-tab__dilated-time,
Expand Down Expand Up @@ -5141,7 +5141,7 @@
/* #region Modals */

@keyframes a-modal-overlay-fadein {
from { background-color: rgba(0, 0, 0, 0%); }

Check warning on line 5144 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L5144

Expected "rgba" to be "rgb". (color-function-alias-notation)
to { background-color: var(--color-overlay); }
}

Expand Down Expand Up @@ -5239,7 +5239,7 @@
border: var(--var-border-width, 0.3rem) solid black;
border-radius: var(--var-border-radius, 0.3rem);
transition-duration: 0.2s;
-webkit-user-select: none;

Check warning on line 5242 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L5242

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down Expand Up @@ -5345,7 +5345,7 @@
.t-dark h3,
.t-dark-metro h3 {
color: #999999;
text-shadow: -0.1rem 0.1rem 0 rgba(0, 0, 0, 50%);

Check warning on line 5348 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L5348

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

/* #endregion t-dark t-dark-metro */
Expand Down Expand Up @@ -5900,7 +5900,7 @@
margin: 0 10rem 1rem;
padding: 1rem;
transition-duration: 0.15s;
-webkit-user-select: none;

Check warning on line 5903 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L5903

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down Expand Up @@ -6069,7 +6069,7 @@
color: black;
background-color: var(--color-effarig--base);
border: var(--var-border-width, 0.2rem) solid black;
box-shadow: 0.1rem 0.1rem 0.3rem rgba(0, 0, 0, 70%);

Check warning on line 6072 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6072

Expected "rgba" to be "rgb". (color-function-alias-notation)
cursor: default;
}

Expand Down Expand Up @@ -6102,7 +6102,7 @@
font-size: 10rem;
font-weight: bold;
transition-duration: 0.2s;
-webkit-user-select: none;

Check warning on line 6105 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6105

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down Expand Up @@ -6161,12 +6161,12 @@

.c-effarig-run-button__inner--running {
position: relative;
-webkit-background-clip: text;

Check warning on line 6164 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6164

Vendor-prefixed property "-webkit-background-clip". (property-no-vendor-prefix)
background-clip: text;
background-image: url("../images/noise.png");
animation: a-effarig-run-button--running-noise 15s infinite alternate;

-webkit-text-fill-color: rgba(255, 0, 0, 50%);

Check warning on line 6169 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6169

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

.c-effarig-run-button__inner--running::after {
Expand All @@ -6181,83 +6181,83 @@

@keyframes a-effarig-run-button--running-noise {
0% {
-webkit-text-fill-color: rgba(255, 0, 0, 100%);

Check warning on line 6184 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6184

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

20% {
background-position: -50px 0;

-webkit-text-fill-color: rgba(255, 0, 0, 100%);

Check warning on line 6190 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6190

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

22% {
background-position: 100px -10px;

-webkit-text-fill-color: rgba(255, 0, 0, 50%);

Check warning on line 6196 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6196

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

24% {
background-position: 0 -150px;

-webkit-text-fill-color: rgba(255, 0, 0, 100%);

Check warning on line 6202 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6202

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

50% {
background-position: -50px 0;

-webkit-text-fill-color: rgba(255, 0, 0, 100%);

Check warning on line 6208 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6208

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

51% {
background-position: 100px -10px;

-webkit-text-fill-color: rgba(255, 0, 0, 50%);

Check warning on line 6214 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6214

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

52% {
background-position: 0 -150px;

-webkit-text-fill-color: rgba(255, 0, 0, 100%);

Check warning on line 6220 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6220

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

54% {
background-position: 50px 0;

-webkit-text-fill-color: rgba(255, 0, 0, 100%);

Check warning on line 6226 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6226

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

56% {
background-position: -100px 10px;

-webkit-text-fill-color: rgba(255, 0, 0, 50%);

Check warning on line 6232 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6232

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

58% {
background-position: 0 50px;

-webkit-text-fill-color: rgba(255, 0, 0, 100%);

Check warning on line 6238 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6238

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

90% {
background-position: 50px 50px;

-webkit-text-fill-color: rgba(255, 0, 0, 100%);

Check warning on line 6244 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6244

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

91% {
background-position: 100px -110px;

-webkit-text-fill-color: rgba(255, 0, 0, 50%);

Check warning on line 6250 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6250

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

92% {
background-position: 0 70px;

-webkit-text-fill-color: rgba(255, 0, 0, 100%);

Check warning on line 6256 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6256

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

100% {
-webkit-text-fill-color: rgba(255, 0, 0, 100%);

Check warning on line 6260 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6260

Expected "rgba" to be "rgb". (color-function-alias-notation)
}
}

Expand Down Expand Up @@ -6303,7 +6303,7 @@

.l-effarig-run-button__fg {
position: relative;
background-color: rgba(0, 0, 0, 0%);

Check warning on line 6306 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6306

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

.l-effarig-shop {
Expand Down Expand Up @@ -6426,7 +6426,7 @@
background-color: #fdd3b0;
border: var(--var-border-width, 0.2rem) solid sandybrown;
border-radius: var(--var-border-radius, 0.5rem);
box-shadow: 0 0 2rem inset rgba(244, 164, 96, 50%);

Check warning on line 6429 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6429

Expected "rgba" to be "rgb". (color-function-alias-notation)
margin: 1rem 0.5rem;
padding: 0.5rem;
padding-top: 1rem;
Expand Down Expand Up @@ -6504,7 +6504,7 @@
margin-top: 1rem;
margin-bottom: 3rem;
padding: 2rem 1rem;
-webkit-user-select: none;

Check warning on line 6507 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6507

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down Expand Up @@ -6545,7 +6545,7 @@
.c-enslaved-run-button__icon__sigil {
position: absolute;
top: -3.7rem;
right: -0.2rem;
right: -0.45rem;
font-size: 14.8rem;
transform: rotate(45deg);
}
Expand All @@ -6555,16 +6555,16 @@
position: absolute;
background-image:
linear-gradient(
rgba(0, 0, 0, 0%) 0%,

Check warning on line 6558 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6558

Expected "rgba" to be "rgb". (color-function-alias-notation)
var(--color-enslaved--base) 20%,
var(--color-enslaved--base) 80%,
rgba(0, 0, 0, 0%) 100%

Check warning on line 6561 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6561

Expected "rgba" to be "rgb". (color-function-alias-notation)
);
border: none;
}

.c-enslaved-run-button__icon:hover .c-enslaved-run-button__icon__glitch {
background-image: linear-gradient(rgba(0, 0, 0, 0%) 0%, black 20%, black 80%, rgba(0, 0, 0, 0%) 100%);

Check warning on line 6567 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6567

Expected "rgba" to be "rgb". (color-function-alias-notation)

Check warning on line 6567 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6567

Expected "rgba" to be "rgb". (color-function-alias-notation)
}

@keyframes a-enslaved-run-button--spin {
Expand Down Expand Up @@ -6710,7 +6710,7 @@
border-radius: var(--var-border-radius, 0.5rem);
margin: 0 0.5rem;
padding: 1rem;
-webkit-user-select: none;

Check warning on line 6713 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6713

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand All @@ -6734,7 +6734,7 @@
justify-content: center;
align-items: center;
transform: skewY(-30deg) rotate(60deg);
-webkit-user-select: none;

Check warning on line 6737 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6737

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down Expand Up @@ -6925,7 +6925,7 @@
color: white;
border-left: 0.1rem solid white;
padding: 0 0.2rem;
-webkit-user-select: none;

Check warning on line 6928 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L6928

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
cursor: default;
}
Expand Down Expand Up @@ -7024,9 +7024,9 @@
background: #222222;
border: 0.1rem solid #111111;
border-radius: var(--var-border-radius, 50%);
box-shadow: 0.1rem 0.1rem 0.1rem rgba(0, 0, 0, 70%);

Check warning on line 7027 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L7027

Expected "rgba" to be "rgb". (color-function-alias-notation)
margin: 0 0.3rem;
-webkit-user-select: none;

Check warning on line 7029 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L7029

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down Expand Up @@ -7288,7 +7288,7 @@
background: #222222;
border: 0.1rem solid black;
border-radius: var(--var-border-radius, 0.8rem);
box-shadow: 0.1rem 0.1rem 0.1rem rgba(0, 0, 0, 70%);

Check warning on line 7291 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L7291

Expected "rgba" to be "rgb". (color-function-alias-notation)
margin-left: 0;
padding: 0.4rem;
transition-duration: 0.3s;
Expand Down Expand Up @@ -7614,7 +7614,7 @@
margin-top: -1.5rem;
margin-left: -1.5rem;
transition: all 0.2s, z-index 0s;
-webkit-user-select: none;

Check warning on line 7617 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L7617

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down Expand Up @@ -7709,7 +7709,7 @@
color: black;
border: var(--var-border-width, 0.2rem) solid #292929;
margin-left: -0.2rem;
-webkit-user-select: none;

Check warning on line 7712 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L7712

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
cursor: pointer;
}
Expand Down Expand Up @@ -8008,7 +8008,7 @@
}

.l-singularity-milestone-modal-container-outer {
overflow-x: hidden;

Check warning on line 8011 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L8011

Expected shorthand property "overflow". (declaration-block-no-redundant-longhand-properties)
overflow-y: scroll;
height: 50rem;
}
Expand Down Expand Up @@ -8281,7 +8281,7 @@
.l-glyph-levels-and-weights__adjust-outline::after {
content: "";
position: absolute;
top: -0.5rem;

Check warning on line 8284 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L8284

Expected shorthand property "inset". (declaration-block-no-redundant-longhand-properties)
right: -0.5rem;
bottom: -0.5rem;
left: -0.5rem;
Expand Down Expand Up @@ -8422,7 +8422,7 @@
font-size: 1rem;
border: 0.1rem solid;
border-radius: var(--var-border-radius, 50%);
-webkit-user-select: none;

Check warning on line 8425 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L8425

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down Expand Up @@ -8703,7 +8703,7 @@
border: 0.1rem solid var(--color-blockmator-block-border);
border-radius: var(--var-border-radius, 0.5rem);
padding: 0 1rem;
-webkit-user-select: none;

Check warning on line 8706 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L8706

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
cursor: grab;
}
Expand Down Expand Up @@ -8849,10 +8849,10 @@
position: relative;
border: var(--var-border-width, 0.2rem) solid black;
border-radius: var(--var-border-radius, 0.4rem);
-webkit-user-select: none;

Check warning on line 8852 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L8852

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;

-webkit-tap-highlight-color: rgba(0, 0, 0, 0%);

Check warning on line 8855 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L8855

Expected "rgba" to be "rgb". (color-function-alias-notation)
touch-action: pan-y;
-webkit-user-drag: none;
}
Expand All @@ -8861,10 +8861,10 @@
width: 100%;
height: 100%;
position: relative;
-webkit-user-select: none;

Check warning on line 8864 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L8864

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;

-webkit-tap-highlight-color: rgba(0, 0, 0, 0%);

Check warning on line 8867 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L8867

Expected "rgba" to be "rgb". (color-function-alias-notation)
touch-action: none;
-webkit-user-drag: none;
}
Expand Down Expand Up @@ -8908,7 +8908,7 @@

.c-h2p-title {
font-size: 3rem;
-webkit-user-select: none;

Check warning on line 8911 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L8911

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down Expand Up @@ -9208,13 +9208,13 @@

.o-no-mouse {
pointer-events: none;
-webkit-user-select: none;

Check warning on line 9211 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L9211

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

.tooltiptext {
pointer-events: none;
-webkit-user-select: none;

Check warning on line 9217 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L9217

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down Expand Up @@ -9282,7 +9282,7 @@
border-radius: var(--var-border-radius, 0.5rem);
margin: 1rem;
padding: 1rem;
-webkit-user-select: none;

Check warning on line 9285 in public/stylesheets/styles.css

View check run for this annotation

codefactor.io / CodeFactor

public/stylesheets/styles.css#L9285

Vendor-prefixed property "-webkit-user-select". (property-no-vendor-prefix)
user-select: none;
}

Expand Down
7 changes: 6 additions & 1 deletion src/components/DescriptionDisplay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ export default {
type: String,
required: false,
default: ""
},
numberPrefixed: {
type: Boolean,
required: false,
default: false
}
},
data() {
Expand Down Expand Up @@ -56,7 +61,7 @@ export default {
const description = config?.description;
// Descriptions in config entries are occasionally used both as standalone statements and mid-sentence,
// so we explicitly capitalize them here because this only shows up in standalone places
const capitalize = str => str.charAt(0).toUpperCase() + str.slice(1);
const capitalize = str => (this.numberPrefixed ? str : str.charAt(0).toUpperCase() + str.slice(1));
this.isVisible = description !== undefined;
if (!this.isVisible) return;

Expand Down
9 changes: 7 additions & 2 deletions src/components/EffectDisplay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ export default {
// Number.MAX_VALUE doesn't really matter here, but we need it because
// undefined values are not allowed for data properties
cap: Number.MAX_VALUE,
hasCap: false
hasCap: false,
effect: ""
};
},
computed: {
Expand All @@ -46,7 +47,10 @@ export default {
return `${this.reachedCap && !this.ignoreCapped ? "Capped" : this.label}: `;
},
effectDisplay() {
return this.formatEffect(this.reachedCap ? this.cap : this.effectValue);
if (this.effectValue || this.reachedCap)
// eslint-disable-next-line vue/no-side-effects-in-computed-properties
this.effect = this.formatEffect(this.reachedCap ? this.cap : this.effectValue);
return this.effect;
}
},
watch: {
Expand All @@ -60,6 +64,7 @@ export default {
this.isVisible = effect !== undefined && formatEffect !== undefined;
if (!this.isVisible) return;
this.formatEffect = formatEffect;
this.effectValue = undefined;

if (isNumber(effect)) {
this.effectValue = effect;
Expand Down
4 changes: 2 additions & 2 deletions src/components/modals/GlyphShowcasePanelEntry.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ export default {
};
},
rarityStyle() {
// Rarity is handled differently here than usual because this is in contrast with the theme BG, not the glyph BG
// Glyph colors were dealt to contrast the background, but that should never be an issue
const color = CosmeticGlyphTypes[this.glyph.type].ignoreRarityColor
? GlyphAppearanceHandler.getBorderColor(this.type)
: getRarity(this.glyph.strength)[Theme.current().isDark() ? "darkColor" : "lightColor"];
: GlyphAppearanceHandler.getRarityColor(this.glyph.strength, this.type);
return {
color,
"font-weight": "bold"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ export default {
if (typeof conditionOfChallenge === "function") {
conditionOfChallenge = conditionOfChallenge();
}
if (this.challenge._config.scrambleText) {
conditionOfChallenge = conditionOfChallenge
.replace("*", this.challenge._config.scrambleText[1]);
// eslint-disable-next-line vue/no-side-effects-in-computed-properties
}
return `Inside this Eternity Challenge, ${conditionOfChallenge}`;
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/modals/prestige/BigCrunchModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default {
},
computed: {
isFirstInfinity() {
return !PlayerProgress.infinityUnlocked();
return !PlayerProgress.infinityUnlocked() && player.records.fullGameCompletions === 0;
},
message() {
const info = this.isFirstInfinity ? this.firstInfinityInfo : ``;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@
methods: {
update() {
const study = this.study;
this.isUseless = Pelle.uselessTimeStudies.includes(this.study.id) && Pelle.isDoomed;
const isCurrentlyUseless = this.study.id === 192 && Pelle.isDoomed && PelleRifts.vacuum.milestones[1];
this.isUseless = Pelle.isDoomed && (isCurrentlyUseless || Pelle.uselessTimeStudies.includes(this.study.id));
this.isBought = ForceBoughtState.getState(this.forceIsBought, study.isBought);
this.doomedRealityStudy = study.type === TIME_STUDY_TYPE.DILATION && study.id === 6 && Pelle.isDoomed;
},
Expand Down Expand Up @@ -133,7 +134,7 @@
position: absolute;
top: 0;
left: 0;
background: rgba(255, 214, 11, 0.8);
background: rgb(255, 214, 11, 0.8);

Check warning on line 137 in src/components/modals/time-study-modal-preview/PseudoTimeStudyButton.vue

View check run for this annotation

codefactor.io / CodeFactor

src/components/modals/time-study-modal-preview/PseudoTimeStudyButton.vue#L137

Expected "0.8" to be "80%". (alpha-value-notation)
border-radius: var(--var-border-radius, inherit);
animation: a-new-import 3s infinite;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ export default {
// than normal and therefore default filling won't be meaningful. Since challenges get completed or abandoned from
// the inside outwards, we show the goals in that priority as well. It only makes sense to check cel6 and not the
// others because pre-cel3 completion it'll default to e4000 and cel4/5 don't have meaningful single goals
const inSpecialRun = Player.isInAntimatterChallenge || EternityChallenge.isRunning || player.dilation.active ||
Laitela.isRunning;
const inSpecialRun = Player.isInAntimatterChallenge || EternityChallenge.isRunning ||
(player.dilation.active && !Pelle.isDoomed) || Laitela.isRunning;
if (inSpecialRun) {
if (Player.isInAntimatterChallenge) {
setProgress(Currency.antimatter.value, Player.antimatterChallenge.goal, "Percentage to Challenge goal");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ export default {
buttonText() {
if (this.lockText !== null) return this.lockText;
const reset = [];
if (!Achievement(111).isUnlocked) reset.push("Dimensions");
if (!Achievement(143).isUnlocked) reset.push("Dimension Boosts");
// eslint-disable-next-line max-len
if (!Achievement(111).isEffectActive && !PelleUpgrade.dimBoostResetsNothing.canBeApplied) reset.push("Dimensions");
// eslint-disable-next-line max-len
if (!Achievement(143).isEffectActive && !PelleUpgrade.galaxyNoResetDimboost.canBeApplied) reset.push("Dimension Boosts");
return reset.length === 0
? `Increase the power of Tickspeed upgrades`
: `Reset your ${makeEnumeration(reset)} to increase the power of Tickspeed upgrades`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,13 @@ export default {

this.multiplierText = `Buy 10 Dimension purchase multiplier: ${formatX(this.buy10Mult, 2, 2)}`;
if (!isSacrificeUnlocked) return;
this.isFullyAutomated = Autobuyer.sacrifice.isActive && Achievement(118).isUnlocked;
this.isSacrificeAffordable = Sacrifice.canSacrifice && !this.isFullyAutomated;
this.isFullyAutomated = Autobuyer.sacrifice.isActive && Achievement(118).isEffectActive &&
Sacrifice.meetsNonBoostConditions;
this.isSacrificeAffordable = this.isFullyAutomated || Sacrifice.canSacrifice;
this.currentSacrifice.copyFrom(Sacrifice.totalBoost);
this.sacrificeBoost.copyFrom(Sacrifice.nextBoost);
this.disabledCondition = Sacrifice.disabledCondition;
this.disabledCondition = this.isFullyAutomated ? Sacrifice.nonBoostDisabledCondition
: Sacrifice.disabledCondition;
const sacText = this.isSacrificeUnlocked
? ` | Dimensional Sacrifice multiplier: ${formatX(this.currentSacrifice, 2, 2)}`
: "";
Expand All @@ -116,10 +118,10 @@ export default {
class="o-primary-btn--sacrifice"
@click="sacrifice"
>
<span v-if="isSacrificeAffordable">Dimensional Sacrifice ({{ formatX(sacrificeBoost, 2, 2) }})</span>
<span v-else-if="isFullyAutomated && disabledCondition !== ''">
<span v-if="isFullyAutomated">
Dimensional Sacrifice is Automated (Achievement 118)
</span>
<span v-else-if="isSacrificeAffordable">Dimensional Sacrifice ({{ formatX(sacrificeBoost, 2, 2) }})</span>
<span v-else>Dimensional Sacrifice Disabled ({{ disabledCondition }})</span>
</PrimaryButton>
<button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ export default {
buttonText() {
if (this.lockText !== null) return this.lockText;
const reset = [];
if (!Achievement(111).isUnlocked) reset.push("Dimensions");
if (!Achievement(143).isUnlocked) reset.push("Dimension Boosts");
// eslint-disable-next-line max-len
if (!Achievement(111).isEffectActive && !PelleUpgrade.dimBoostResetsNothing.canBeApplied) reset.push("Dimensions");
// eslint-disable-next-line max-len
if (!Achievement(143).isEffectActive && !PelleUpgrade.galaxyNoResetDimboost.canBeApplied) reset.push("Dimension Boosts");
return reset.length === 0
? `Increase the power of Tickspeed upgrades`
: `Reset your ${makeEnumeration(reset)} to increase the power of Tickspeed upgrades`;
Expand Down
2 changes: 1 addition & 1 deletion src/components/tabs/celestial-pelle/PelleUpgrade.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default {
this.galaxyCap = GalaxyGenerator.generationCap;
const genDB = GameDatabase.celestials.pelle.galaxyGeneratorUpgrades;
this.notAffordable = (this.config === genDB.additive || this.config === genDB.multiplicative) &&
(Decimal.gt(this.upgrade.cost, this.galaxyCap - GalaxyGenerator.generatedGalaxies + player.galaxies));
(Decimal.gt(this.upgrade.cost, this.galaxyCap - GalaxyGenerator.spentGalaxies + player.galaxies));
},
secondsUntilCost(rate) {
const value = this.galaxyGenerator ? player.galaxies + GalaxyGenerator.galaxies : Currency.realityShards.value;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ export default {
config() {
return this.upgrade.config;
},
prefixedWithNumber() {
return Boolean(this.config.prefixedNumber);
},
classObject() {
return {
"c-reality-upgrade-btn--useless": this.upgrade.pelleDisabled,
Expand Down Expand Up @@ -113,6 +116,7 @@ export default {
<br>
<DescriptionDisplay
:config="requirementConfig"
:number-prefixed="prefixedWithNumber"
label="Requirement:"
class="c-reality-upgrade-btn__requirement"
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export default {
return `${format(run[2], 2)} ${this.points}`;
},
prestigeCountGain(run) {
return quantify(this.singular, run[3]);
return quantify(this.singular, run[3], 2, 1);
},
prestigeCurrencyRate(run) {
if (this.hasIM && this.layer.name === "Reality") return "N/A";
Expand Down Expand Up @@ -302,4 +302,4 @@ export default {
.l-no-records {
height: 5.4rem;
}
</style>
</style>
4 changes: 4 additions & 0 deletions src/components/tabs/reality-upgrades/RealityUpgradeButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ export default {
config() {
return this.upgrade.config;
},
prefixedWithNumber() {
return Boolean(this.config.prefixedNumber);
},
classObject() {
return {
"c-reality-upgrade-btn--useless": this.isUseless,
Expand Down Expand Up @@ -106,6 +109,7 @@ export default {
<br>
<DescriptionDisplay
:config="requirementConfig"
:number-prefixed="prefixedWithNumber"
label="Requirement:"
class="c-reality-upgrade-btn__requirement"
/>
Expand Down
4 changes: 2 additions & 2 deletions src/components/tabs/replicanti/ReplicantiTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export default {
this.hasIPMult = AlchemyResource.exponential.amount > 0 && !this.isDoomed;
this.multIP = Replicanti.amount.powEffectOf(AlchemyResource.exponential);
this.isUncapped = PelleRifts.vacuum.milestones[1].canBeApplied;
this.hasRaisedCap = EffarigUnlock.infinity.isUnlocked && !this.isUncapped;
this.hasRaisedCap = EffarigUnlock.infinity.isUnlocked && !this.isDoomed;
this.replicantiCap.copyFrom(replicantiCap());
if (this.hasRaisedCap) {
const mult = this.replicantiCap.div(Decimal.NUMBER_MAX_VALUE);
Expand Down Expand Up @@ -201,7 +201,7 @@ export default {
</PrimaryButton>
<template v-else>
<div
v-if="isDoomed"
v-if="isUncapped"
class="modified-cap"
>
Your Replicanti cap has been removed due to the second {{ scrambledText }} milestone.
Expand Down
12 changes: 11 additions & 1 deletion src/components/ui-modes/modern/ModernSidebarCurrency.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
return {
sidebarID: 0,
resourceName: "",
resourceValue: new Decimal(0)
resourceValue: new Decimal(0),
fullGameCompletions: 0,
hasInit: false
};
},
computed: {
Expand All @@ -26,6 +28,14 @@
},
methods: {
update() {
if (!this.hasInit) {
this.fullGameCompletions = player.records.fullGameCompletions;
this.hasInit = true;
}
if (this.fullGameCompletions !== player.records.fullGameCompletions) {
player.options.sidebarResourceID = 2;
this.fullGameCompletions = player.records.fullGameCompletions;
}
this.sidebarID = player.options.sidebarResourceID;
this.resourceName = this.resource.resourceName ?? this.resource.optionName;
this.resourceValue.copyFrom(this.resource.value());
Expand Down Expand Up @@ -94,7 +104,7 @@

.c-sidebar-resource:last-child {
border-bottom-right-radius: var(--var-border-radius, 0.5rem);
}

Check warning on line 107 in src/components/ui-modes/modern/ModernSidebarCurrency.vue

View check run for this annotation

codefactor.io / CodeFactor

src/components/ui-modes/modern/ModernSidebarCurrency.vue#L107

Expected "rgba" to be "rgb". (color-function-alias-notation)

Check warning on line 107 in src/components/ui-modes/modern/ModernSidebarCurrency.vue

View check run for this annotation

codefactor.io / CodeFactor

src/components/ui-modes/modern/ModernSidebarCurrency.vue#L107

Expected "rgba" to be "rgb". (color-function-alias-notation)

.c-sidebar-resource h2 {
z-index: 1;
Expand Down
5 changes: 5 additions & 0 deletions src/core/automator/automator-backend.js
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,7 @@ export const AutomatorBackend = {
// program flow to do something else other than simply advancing to the next line
switch (this.runCurrentCommand()) {
case AUTOMATOR_COMMAND_STATUS.NEXT_TICK_SAME_INSTRUCTION:
case AUTOMATOR_COMMAND_STATUS.SAME_INSTRUCTION:
break;
case AUTOMATOR_COMMAND_STATUS.HALT:
this.stop();
Expand Down Expand Up @@ -964,6 +965,7 @@ export const AutomatorBackend = {
this.state.mode = AUTOMATOR_MODE.PAUSE;
},

// eslint-disable-next-line no-shadow
start(scriptID = this.state.topLevelScript, initialMode = AUTOMATOR_MODE.RUN, compile = true) {
// Automator execution behaves oddly across new games, so we explicitly stop it from running if not unlocked
if (!Player.automatorUnlocked) return;
Expand Down Expand Up @@ -1030,6 +1032,9 @@ export const AutomatorBackend = {
this._data = [];
player.reality.automator.state.stack.length = 0;
},
forEach(fn) {
this._data.forEach(fn);
},
initializeFromSave(commands) {
this._data = [];
const playerStack = player.reality.automator.state.stack;
Expand Down
16 changes: 10 additions & 6 deletions src/core/automator/automator-commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@

function prestigeNotify(flag) {
if (!AutomatorBackend.isOn) return;
const state = AutomatorBackend.stack.top.commandState;
if (state && state.prestigeLevel !== undefined) {
state.prestigeLevel = Math.max(state.prestigeLevel, flag);
}

// Any frame in the stack may be waiting for a prestige event, so update all of them.
AutomatorBackend.stack.forEach(frame => {
const state = frame.commandState;
if (state && state.prestigeLevel !== undefined) {
state.prestigeLevel = Math.max(state.prestigeLevel, flag);
}
});
}

EventHub.logic.on(GAME_EVENT.BIG_CRUNCH_AFTER, () => prestigeNotify(T.Infinity.$prestigeLevel));
Expand Down Expand Up @@ -459,15 +463,15 @@
const prestigeToken = ctx.PrestigeEvent[0].tokenType;
return () => {
const available = prestigeToken.$prestigeAvailable();
const prestigeName = ctx.PrestigeEvent[0].image.toUpperCase();
if (!available) {
if (!nowait) return AUTOMATOR_COMMAND_STATUS.NEXT_TICK_SAME_INSTRUCTION;
AutomatorData.logCommandEvent(`${ctx.PrestigeEvent.image} attempted, but skipped due to NOWAIT`,
AutomatorData.logCommandEvent(`${prestigeName} attempted, but skipped due to NOWAIT`,
ctx.startLine);
return AUTOMATOR_COMMAND_STATUS.NEXT_INSTRUCTION;
}
if (respec) prestigeToken.$respec();
prestigeToken.$prestige();
const prestigeName = ctx.PrestigeEvent[0].image.toUpperCase();
AutomatorData.logCommandEvent(`${prestigeName} triggered (${findLastPrestigeRecord(prestigeName)})`,
ctx.startLine);
// In the prestigeToken.$prestige() line above, performing a reality reset has code internal to the call
Expand Down Expand Up @@ -619,49 +623,49 @@
},
compile: ctx => {
const studies = ctx.$studies;
if (ctx.Nowait === undefined) return () => {
let prePurchasedStudies = 0;
let purchasedStudies = 0;
let finalPurchasedTS;
for (const tsNumber of studies.normal) {
if (TimeStudy(tsNumber).isBought) prePurchasedStudies++;
else if (TimeStudy(tsNumber).purchase(true)) purchasedStudies++;
else finalPurchasedTS = finalPurchasedTS ?? tsNumber;
}
if (prePurchasedStudies + purchasedStudies < studies.normal.length) {
if (prePurchasedStudies + purchasedStudies === 0) {
AutomatorData.logCommandEvent(`Could not purchase any of the specified Time Studies`, ctx.startLine);
}
if (purchasedStudies > 0 && finalPurchasedTS) {
AutomatorData.logCommandEvent(`Purchased ${quantifyInt("Time Study", purchasedStudies)} and stopped at
Time Study ${finalPurchasedTS}, waiting to attempt to purchase more Time Studies`, ctx.startLine);
}
return AUTOMATOR_COMMAND_STATUS.NEXT_TICK_SAME_INSTRUCTION;
}
const hasEC = studies.ec ? TimeStudy.eternityChallenge(studies.ec).isBought : false;
if (!studies.ec || (hasEC && !studies.startEC)) {
AutomatorData.logCommandEvent(`Purchased all specified Time Studies`, ctx.startLine);
return AUTOMATOR_COMMAND_STATUS.NEXT_INSTRUCTION;
}
const unlockedEC = TimeStudy.eternityChallenge(studies.ec).purchase(true);
if (hasEC || unlockedEC) {
if (studies.startEC) {
EternityChallenge(studies.ec).start(true);
if (EternityChallenge(studies.ec).isRunning) {
AutomatorData.logCommandEvent(`Purchased all specified Time Studies, then unlocked and started running
Eternity Challenge ${studies.ec}`, ctx.startLine);
} else {
AutomatorData.logCommandEvent(`Purchased all specified Time Studies and unlocked Eternity Challenge
${studies.ec}, but failed to start it`, ctx.startLine);
}
} else {
AutomatorData.logCommandEvent(`Purchased all specified Time Studies and unlocked Eternity Challenge
${studies.ec}`, ctx.startLine);
}
return AUTOMATOR_COMMAND_STATUS.NEXT_INSTRUCTION;
}
return AUTOMATOR_COMMAND_STATUS.NEXT_TICK_SAME_INSTRUCTION;
};

Check notice on line 668 in src/core/automator/automator-commands.js

View check run for this annotation

codefactor.io / CodeFactor

src/core/automator/automator-commands.js#L626-L668

Complex Method
return () => {
for (const tsNumber of studies.normal) TimeStudy(tsNumber).purchase(true);
if (!studies.ec || TimeStudy.eternityChallenge(studies.ec).isBought) {
Expand Down
3 changes: 2 additions & 1 deletion src/core/celestials/celestials.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ GameDatabase.celestials.descriptions = [
Tachyon Particle production and Dilated Time production are severely reduced.
Time Theorem generation from Dilation Glyphs is disabled.
Certain challenge goals are increased.
Stored game time is discharged at a reduced effectiveness (exponent^${format(0.55, 2, 2)}).`;
Stored game time is discharged at a reduced effectiveness (exponent^${format(0.55, 2, 2)}).
Dimensional Sacrifice is disabled.`;
}
},
{
Expand Down
Loading
Loading