Merge branch 'main' into day-20-factory

This commit is contained in:
thepaperpilot 2022-12-20 21:56:47 -06:00
commit 9163b840b9
2 changed files with 2 additions and 1 deletions

View file

@ -304,6 +304,7 @@ const layer = createLayer(id, function (this: BaseLayer) {
goal: 500, goal: 500,
name, name,
day, day,
textColor: "var(--feature-foreground)",
background: { background: {
gradient: "toys-bar", gradient: "toys-bar",
duration: "15s" duration: "15s"

View file

@ -560,7 +560,7 @@ export const main = createLayer("main", function (this: BaseLayer) {
display: jsx(() => ( display: jsx(() => (
<> <>
{player.devSpeed === 0 ? <div>Game Paused</div> : null} {player.devSpeed === 0 ? <div>Game Paused</div> : null}
{player.devSpeed != null && player.devSpeed !== 1 ? ( {player.devSpeed != null && player.devSpeed !== 0 && player.devSpeed !== 1 ? (
<div>Dev Speed: {format(player.devSpeed)}x</div> <div>Dev Speed: {format(player.devSpeed)}x</div>
) : null} ) : null}
{player.offlineTime != null && player.offlineTime !== 0 ? ( {player.offlineTime != null && player.offlineTime !== 0 ? (