Skip to content

Commit 59d68fc

Browse files
committed
Move Ants to Features Folder (1)
1 parent d4a6190 commit 59d68fc

36 files changed

Lines changed: 1213 additions & 1043 deletions

Synergism.css

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2608,7 +2608,16 @@ p#reincarnatehotkeys {
26082608
height: 100%;
26092609
}
26102610

2611-
.antTierBtnAvailable,
2611+
.antTierBtnAvailable {
2612+
cursor: pointer;
2613+
background-color: burlywood;
2614+
}
2615+
2616+
.antMasteryBtnAvailable {
2617+
cursor: pointer;
2618+
background-color: lightgreen;
2619+
}
2620+
26122621
.antUpgradeBtnAvailable {
26132622
cursor: pointer;
26142623
background-color: silver;

src/Achievements.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import Decimal from 'break_infinity.js'
22
import i18next from 'i18next'
3-
import { AntProducers, calculateLeaderboardValue, LAST_ANT } from './Ants'
3+
import { calculateLeaderboardValue } from './Ants'
44
import { DOMCacheGetOrSet } from './Cache/DOM'
55
import { CalcCorruptionStuff, calculateAscensionScore } from './Calculate'
66
import { campaignTokens } from './Campaign'
7+
import { AntProducers, LAST_ANT_PRODUCER } from './Features/Ants/structs/structs'
78
import { hepteracts } from './Hepteracts'
89
import { displayLevelStuff } from './Levels'
910
import { maxOcteractUpgradeAP, octeractUpgrades } from './Octeracts'
@@ -289,15 +290,15 @@ export const progressiveAchievements: Record<ProgressiveAchievements, Progressiv
289290
maxPointValue: 324,
290291
pointsAwarded: (_cached: number) => {
291292
let pointValue = 0
292-
for (let ant = AntProducers.Workers; ant <= LAST_ANT; ant++) {
293-
pointValue += 3 * player.ants.producers[ant].highestMastery
293+
for (let ant = AntProducers.Workers; ant <= LAST_ANT_PRODUCER; ant++) {
294+
pointValue += 3 * player.ants.masteries[ant].highestMastery
294295
}
295296
return pointValue
296297
},
297298
updateValue: () => {
298299
let numMasteries = 0
299-
for (let ant = AntProducers.Workers; ant <= LAST_ANT; ant++) {
300-
numMasteries += player.ants.producers[ant].highestMastery
300+
for (let ant = AntProducers.Workers; ant <= LAST_ANT_PRODUCER; ant++) {
301+
numMasteries += player.ants.masteries[ant].highestMastery
301302
}
302303
return numMasteries
303304
},

0 commit comments

Comments
 (0)