Skip to content
Merged
2 changes: 1 addition & 1 deletion app/players/content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
import { Companion } from '../../data/domain/companions';
import { Votes } from '../../data/domain/world-2/votes';

function ItemSourcesDisplay({ sources, dropInfo }: { sources: SourcesModel, dropInfo: DropSource[] }) {

Check warning on line 67 in app/players/content.tsx

View workflow job for this annotation

GitHub Actions / test (20.x)

'dropInfo' is defined but never used. Allowed unused args must match /^_/u

const possibleSources = useMemo(() => {
if (!sources) {
Expand Down Expand Up @@ -246,7 +246,7 @@
return (new Date().getTime() - lastUpdated.getTime()) / 1000;
}
return 0;
}, [theData, lastUpdated]);

Check warning on line 249 in app/players/content.tsx

View workflow job for this annotation

GitHub Actions / test (20.x)

React Hook useMemo has an unnecessary dependency: 'theData'. Either exclude it or remove the dependency array

return (
<Box pad="medium">
Expand Down Expand Up @@ -1091,7 +1091,7 @@
"Blunder Hills", "JungleZ", "PlayerSelect", "Efaunt's Tomb", "Gravel Tomb", "Heaty Hole", "End Of The Road", "Z", "Eycicles's Nest", "Enclave a la Troll",
"Magma Rivertown", "YumYum Islands", "Chizoar's Cavern", "Tunnel Closed", "KattleKruk's Volcano",
// world 6
"Motherlode Pit", "Companion Park", "Spirit Village", "Emperor's Castle",
"Motherlode Pit", "Pet Park", "Spirit Village", "Emperor's Castle",
// minigame Howl and Poppy
"Grand Owl Perch", "The Oasis"
].includes(area)) {
Expand Down
18 changes: 17 additions & 1 deletion app/world-2/alchemy/content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,25 @@ function SigilsDisplay() {
const reqLimit = (sigil.boostLevel == 1 && sigil.canBeIonized) ? (sigil.data.x1 ?? 0) : sigil.boostLevel == 0 ? sigil.data.boostCost : sigil.boostLevel == -1 ? sigil.data.unlockCost : 0;
const chargeSpeed = sigil.activePlayers * sigilData.chargeSpeed;
const timeToNext = ((reqLimit - sigil.progress) / chargeSpeed) * 3600;
let filter = undefined;
switch (sigil.boostLevel) {
case 1:
filter = "hue-rotate(202deg)"
break;
case 2:
filter = "hue-rotate(150deg)"
break;
case 3:
filter = "hue-rotate(80deg)"
break;
case 4:
filter = "hue-rotate(260deg)"
break;
}

return (
<ShadowBox background="dark-1" key={index} margin={{ right: 'small', bottom: 'small' }} gap="medium" align="start" pad="small" border={sigil.activePlayers > 0 ? { color: 'green-1', size: '1px' } : undefined}>
<IconImage style={sigil.boostLevel == 2 ? { filter: 'hue-rotate(130deg)' } : sigil.boostLevel == 1 ? { filter: 'hue-rotate(200deg)' } : sigil.boostLevel == -1 ? { opacity: 0.2 } : undefined} data={sigil.getImageData()} />
<IconImage style={{ filter: filter, opacity: sigil.boostLevel > 0 ? 1 : 0.2 }} data={sigil.getImageData()} />
<Box direction="row" gap="medium">
<TextAndLabel textSize="xsmall" label="Name" text={sigil.data.name} />
<TextAndLabel textSize="xsmall" label="Description" text={sigil.getBonusText()} />
Expand Down
16 changes: 14 additions & 2 deletions app/world-3/construction/content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,13 @@ function RefineryDisplay() {
});
}
let totalWait = 0;
const refineryCycle = Math.floor(index / 3) == 0 ? refineryData.cycleInfo["Combustion"] : refineryData.cycleInfo["Synthesis"];
let refineryCycle = refineryData.cycleInfo["Combustion"];
if (Math.floor(index / 3) == 1) {
refineryCycle = refineryData.cycleInfo["Synthesis"];
}
if (Math.floor(index / 3) == 2) {
refineryCycle = refineryData.cycleInfo["Polymerization"]
}
let timeToNextRank = info.getTimeToNextRank(refineryCycle.cycleTime);
while (timeToNextRank > 0) {
const nextCDTime = Math.min(...currentCooldowns.map(cooldowns => cooldowns[1]));
Expand Down Expand Up @@ -197,7 +203,13 @@ function RefineryDisplay() {
const inChestStorage = storage?.chest.find((item) => item.internalName == storageItem.internalName)
storageItem.count = (inSaltStorage?.quantity ?? 0) + (inChestStorage?.count ?? 0);
});
const refineryCycle = Math.floor(index / 3) == 0 ? refineryData.cycleInfo["Combustion"] : refineryData.cycleInfo["Synthesis"];
let refineryCycle = refineryData.cycleInfo["Combustion"];
if (Math.floor(index / 3) == 1) {
refineryCycle = refineryData.cycleInfo["Synthesis"];
}
if (Math.floor(index / 3) == 2) {
refineryCycle = refineryData.cycleInfo["Polymerization"]
}
const secondsSinceUpdate = (new Date().getTime() - (lastUpdated?.getTime() ?? 0)) / 1000;
const fuelTime = Math.max(0, info.getFuelTime(storageItems, [], index <= saltMeritLevel) * refineryCycle.cycleTime - secondsSinceUpdate);
const timeToNextRank = info.getTimeToNextRank(refineryCycle.cycleTime) - secondsSinceUpdate;
Expand Down
Loading
Loading