diff --git a/src/data/layers/oil.tsx b/src/data/layers/oil.tsx
index 87002fe..c13f136 100644
--- a/src/data/layers/oil.tsx
+++ b/src/data/layers/oil.tsx
@@ -921,139 +921,154 @@ const layer = createLayer(id, function (this: BaseLayer) {
collapsedOilMilestones,
generalTabCollapsed,
- display: jsx(() => (
- <>
- {render(trackerDisplay)}
-
- {Decimal.lt(coalEffectiveness.value, 1) ? (
- Coal efficiency: {format(Decimal.mul(coalEffectiveness.value, 100))}%
- ) : null}
- {Decimal.lt(oilEffectiveness.value, 1) ? (
- Oil efficiency: {format(Decimal.mul(oilEffectiveness.value, 100))}%
- ) : null}
- (
- <>
- {Decimal.lt(depth.value, 1000) ? (
- "Reach 1000m to start gaining oil"
- ) : (
- <>
- {formatGain(
- Decimal.add(
- computedOilSpeed.value,
- computedOilConsumption.value
- )
- )}
-
- )}
-
- ))}
- />
- {Decimal.eq(computedOilSpeed.value, 0) ? (
- <>
- (Need at least 1 Oil Pump, 1 Heavy Drill and 1 Heavy Extractor active to
- gain oil)
-
-
- ) : (
- ""
- )}
-
- {depthMilestones[6].earned.value ? (
-
- {render(buildPump)}
-
- {formatWhole(Decimal.floor(activePump.value))}/
- {formatWhole(Decimal.floor(buildPump.amount.value))}
-
- {renderRow(minPump, removePump, addPump, maxPump)}
-
- ) : null}
- {oilMilestones[0].earned.value ? (
-
- {render(buildBurner)}
-
- {formatWhole(Decimal.floor(activeBurner.value))}/
- {formatWhole(Decimal.floor(buildBurner.amount.value))}
-
- {renderRow(minBurner, removeBurner, addBurner, maxBurner)}
-
- ) : null}
- {oilMilestones[2].earned.value ? (
-
- {render(buildSmelter)}
-
- {formatWhole(Decimal.floor(activeSmelter.value))}/
- {formatWhole(Decimal.floor(buildSmelter.amount.value))}
-
- {renderRow(minSmelter, removeSmelter, addSmelter, maxSmelter)}
-
- ) : null}
-
-
-
- The well is
-
- {formatWhole(depth.value)}
-
- m deep
-
- Next at {format(Decimal.sub(drillProgressReq.value, drillProgress.value))} drill
- power seconds
-
-
- Your drill power is
-
- {format(computedDrillPower.value)}
-
-
-
-
-
- {render(buildHeavy)}
+ display: jsx(() => {
+ const upgrades: GenericUpgrade[][] = [];
+
+ if (oilMilestones[1].earned.value) {
+ upgrades.push(row1Upgrades);
+ }
+ if (depthMilestones[1].earned.value) {
+ upgrades.push(row2Upgrades);
+ }
+ return (
+ <>
+ {render(trackerDisplay)}
+
+ {Decimal.lt(coalEffectiveness.value, 1) ? (
- {formatWhole(Decimal.floor(activeHeavy.value))}/
- {formatWhole(Decimal.floor(buildHeavy.amount.value))}
+ Coal efficiency: {format(Decimal.mul(coalEffectiveness.value, 100))}%
- {renderRow(minHeavy, removeHeavy, addHeavy, maxHeavy)}
-
- {depthMilestones[3].earned.value ? (
-
- {render(buildHeavy2)}
-
- {formatWhole(Decimal.floor(activeHeavy2.value))}/
- {formatWhole(Decimal.floor(buildHeavy2.amount.value))}
-
- {renderRow(minHeavy2, removeHeavy2, addHeavy2, maxHeavy2)}
-
) : null}
- {depthMilestones[5].earned.value ? (
-
- {render(buildExtractor)}
-
- {formatWhole(Decimal.floor(activeExtractor.value))}/
- {formatWhole(Decimal.floor(buildExtractor.amount.value))}
-
- {renderRow(minExtractor, removeExtractor, addExtractor, maxExtractor)}
-
+ {Decimal.lt(oilEffectiveness.value, 1) ? (
+
+ Oil efficiency: {format(Decimal.mul(oilEffectiveness.value, 100))}%
+
) : null}
-
-
- {renderGrid(
- ...(oilMilestones[1].earned.value
- ? depthMilestones[1].earned.value
- ? [row1Upgrades, row2Upgrades]
- : [row1Upgrades]
- : [])
- )}
-
- {depthMilestonesDisplay()}
- {Decimal.gte(totalOil.value, 50) ? oilMilestonesDisplay() : ""}
-
- ))
+ (
+ <>
+ {Decimal.lt(depth.value, 1000) ? (
+ "Reach 1000m to start gaining oil"
+ ) : (
+ <>
+ {formatGain(
+ Decimal.add(
+ computedOilSpeed.value,
+ computedOilConsumption.value
+ )
+ )}
+
+ )}
+
+ ))}
+ />
+ {Decimal.eq(computedOilSpeed.value, 0) ? (
+ <>
+ (Need at least 1 Oil Pump, 1 Heavy Drill and 1 Heavy Extractor active to
+ gain oil)
+
+
+ ) : (
+ ""
+ )}
+
+ {depthMilestones[6].earned.value ? (
+
+ {render(buildPump)}
+
+ {formatWhole(Decimal.floor(activePump.value))}/
+ {formatWhole(Decimal.floor(buildPump.amount.value))}
+
+ {renderRow(minPump, removePump, addPump, maxPump)}
+
+ ) : null}
+ {oilMilestones[0].earned.value ? (
+
+ {render(buildBurner)}
+
+ {formatWhole(Decimal.floor(activeBurner.value))}/
+ {formatWhole(Decimal.floor(buildBurner.amount.value))}
+
+ {renderRow(minBurner, removeBurner, addBurner, maxBurner)}
+
+ ) : null}
+ {oilMilestones[2].earned.value ? (
+
+ {render(buildSmelter)}
+
+ {formatWhole(Decimal.floor(activeSmelter.value))}/
+ {formatWhole(Decimal.floor(buildSmelter.amount.value))}
+
+ {renderRow(minSmelter, removeSmelter, addSmelter, maxSmelter)}
+
+ ) : null}
+
+
+
+ The well is
+
+ {formatWhole(depth.value)}
+
+ m deep
+
+ Next at {format(
+ Decimal.sub(drillProgressReq.value, drillProgress.value)
+ )}{" "}
+ drill power seconds
+
+
+ Your drill power is
+
+ {format(computedDrillPower.value)}
+
+
+
+
+
+ {render(buildHeavy)}
+
+ {formatWhole(Decimal.floor(activeHeavy.value))}/
+ {formatWhole(Decimal.floor(buildHeavy.amount.value))}
+
+ {renderRow(minHeavy, removeHeavy, addHeavy, maxHeavy)}
+
+ {depthMilestones[3].earned.value ? (
+
+ {render(buildHeavy2)}
+
+ {formatWhole(Decimal.floor(activeHeavy2.value))}/
+ {formatWhole(Decimal.floor(buildHeavy2.amount.value))}
+
+ {renderRow(minHeavy2, removeHeavy2, addHeavy2, maxHeavy2)}
+
+ ) : null}
+ {depthMilestones[5].earned.value ? (
+
+ {render(buildExtractor)}
+
+ {formatWhole(Decimal.floor(activeExtractor.value))}/
+ {formatWhole(Decimal.floor(buildExtractor.amount.value))}
+
+ {renderRow(
+ minExtractor,
+ removeExtractor,
+ addExtractor,
+ maxExtractor
+ )}
+
+ ) : null}
+
+
+ {renderGrid(...upgrades)}
+
+ {depthMilestonesDisplay()}
+ {Decimal.gte(totalOil.value, 50) ? oilMilestonesDisplay() : ""}
+
+ );
+ })
};
});