Merge pull request #2523 from MartinFournier/fix/unavailable-achievements

Fix unavailable achievements condition
This commit is contained in:
hydroflame 2022-01-10 13:26:10 -05:00 committed by GitHub
commit 4156212c0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions

@ -29,7 +29,7 @@ export function AchievementList({ achievements, playerAchievements }: IProps): J
const secret = data.filter(entry => !entry.unlockedOn && entry.achievement.Secret) const secret = data.filter(entry => !entry.unlockedOn && entry.achievement.Secret)
// Locked behind locked content (bitnode x) // Locked behind locked content (bitnode x)
const unavailable = data.filter(entry => !entry.unlockedOn && !entry.achievement.Secret && entry.achievement.Visible && entry.achievement.Visible()); const unavailable = data.filter(entry => !entry.unlockedOn && !entry.achievement.Secret && entry.achievement.Visible && !entry.achievement.Visible());
// Remaining achievements // Remaining achievements
const locked = data const locked = data
@ -53,7 +53,7 @@ export function AchievementList({ achievements, playerAchievements }: IProps): J
</AccordionSummary> </AccordionSummary>
<AccordionDetails sx={{ pt: 2 }}> <AccordionDetails sx={{ pt: 2 }}>
{unlocked.map(item => ( {unlocked.map(item => (
<AchievementEntry key={item.achievement.ID} <AchievementEntry key={`unlocked_${item.achievement.ID}`}
achievement={item.achievement} achievement={item.achievement}
unlockedOn={item.unlockedOn} unlockedOn={item.unlockedOn}
cssFiltersUnlocked={cssPrimary} cssFiltersUnlocked={cssPrimary}
@ -72,7 +72,7 @@ export function AchievementList({ achievements, playerAchievements }: IProps): J
</AccordionSummary> </AccordionSummary>
<AccordionDetails sx={{ pt: 2 }}> <AccordionDetails sx={{ pt: 2 }}>
{locked.map(item => ( {locked.map(item => (
<AchievementEntry key={item.achievement.ID} <AchievementEntry key={`locked_${item.achievement.ID}`}
achievement={item.achievement} achievement={item.achievement}
cssFiltersUnlocked={cssPrimary} cssFiltersUnlocked={cssPrimary}
cssFiltersLocked={cssSecondary} /> cssFiltersLocked={cssSecondary} />
@ -106,10 +106,10 @@ export function AchievementList({ achievements, playerAchievements }: IProps): J
<AccordionDetails> <AccordionDetails>
<Typography color="secondary" sx={{ mt: 1 }}> <Typography color="secondary" sx={{ mt: 1 }}>
{secret.map(item => ( {secret.map(item => (
<> <span key={`secret_${item.achievement.ID}`}>
<CorruptableText content={item.achievement.ID}></CorruptableText> <CorruptableText content={item.achievement.ID}></CorruptableText>
<br /> <br />
</> </span>
))} ))}
</Typography> </Typography>
</AccordionDetails> </AccordionDetails>

@ -337,6 +337,7 @@ export const achievements: IMap<Achievement> = {
}, },
FIRST_HACKNET_NODE: { FIRST_HACKNET_NODE: {
...achievementData["FIRST_HACKNET_NODE"], ...achievementData["FIRST_HACKNET_NODE"],
Icon: "node",
Condition: () => !hasHacknetServers(Player) && Player.hacknetNodes.length > 0, Condition: () => !hasHacknetServers(Player) && Player.hacknetNodes.length > 0,
}, },
"30_HACKNET_NODE": { "30_HACKNET_NODE": {