diff --git a/src/data/data.tsx b/src/data/data.tsx index 221c7e5..f51adc6 100644 --- a/src/data/data.tsx +++ b/src/data/data.tsx @@ -293,7 +293,9 @@ export const passives = { }, silverRelic: { description: (empowered: boolean) => - empowered ? "(Power machines)^2 boost ore dropped" : "Power machines boost ore dropped" + empowered + ? "(Powered machines)^2 boost quarry speed" + : "Powered machines boost quarry speed" }, goldRelic: { description: (empowered: boolean) => @@ -307,7 +309,7 @@ export const passives = { }, platinumRelic: { description: (empowered: boolean) => - empowered ? "Triple dimensions' tick rate" : "Double dimensions' tick rate" + empowered ? "Quadruple dimensions' tick rate" : "Double dimensions' tick rate" }, diamondRelic: { description: (empowered: boolean) => diff --git a/src/data/nodeTypes.tsx b/src/data/nodeTypes.tsx index 691286d..f087052 100644 --- a/src/data/nodeTypes.tsx +++ b/src/data/nodeTypes.tsx @@ -47,6 +47,7 @@ import { influences, passives, relics, + resourceNames, tools } from "./data"; import { GenericPlane, createPlane } from "./planes"; @@ -213,10 +214,32 @@ export const factory = { draggable: true } as NodeTypeOptions; +const romanNumerals = [ + "I", + "II", + "III", + "IV", + "V", + "VI", + "VII", + "VIII", + "IX", + "X", + "XI", + "XII", + "XIII", + "XIV", + "XV", + "XVI" +]; export const resource = { shape: Shape.Circle, size: 50, - title: node => camelToTitle((node.state as unknown as ResourceState).type), + title: node => + camelToTitle((node.state as unknown as ResourceState).type) + + " (" + + romanNumerals[resourceNames.indexOf((node.state as unknown as ResourceState).type)] + + ")", subtitle: node => formatWhole((node.state as unknown as ResourceState).amount), progress: node => getResourceLevelProgress((node.state as unknown as ResourceState).type), // Make clicking resources a no-op so they can't be selected diff --git a/src/data/projEntry.tsx b/src/data/projEntry.tsx index 611a86d..f6015f8 100644 --- a/src/data/projEntry.tsx +++ b/src/data/projEntry.tsx @@ -222,10 +222,17 @@ export const main = createLayer("main", function (this: BaseLayer) { return 0; } const resources = (quarry.value.state as unknown as QuarryState).resources; - return resources.reduce( + let progress = resources.reduce( (acc, curr) => Decimal.div(100, dropRates[curr].computedModifier.value).add(acc), Decimal.dZero ); + if (toolNodes.value.silverRelic != null) { + progress = Decimal.div(progress, Decimal.add(numPoweredMachines.value, 1)); + if (isEmpowered("silverRelic")) { + progress = Decimal.div(progress, Decimal.add(numPoweredMachines.value, 1)); + } + } + return progress; }); const board = createBoard(board => ({