sinvo/lifeRestart
1
0
Fork 0
mirror of https://github.com/VickScarlet/lifeRestart.git synced 2026-08-27 08:46:48 +08:00
Code Issues Projects Releases Wiki Activity

fix: talent

Browse Source
This commit is contained in:
Vick Scarlet
2026-08-16 20:06:16 +08:00
committed by 神戸小鳥
parent 322f775796
commit dfdbfd69e7
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/core/src/talent.ts
+13 -5
View File
@@ -69,8 +69,12 @@ export function pull(
talentRateWithAddition(options.rate, profile).entries(),
)
const result = []
if (profile.lockedTalent) result.push(profile.lockedTalent)
const map = new Map(Grades.map(g => [g, new Set(GradeMap.get(g))]))
if (profile.lockedTalent) {
result.push(profile.lockedTalent)
const { grade } = talents.get(profile.lockedTalent)!
map.get(grade)!.delete(profile.lockedTalent)
}
for (let i = options.count - result.length; i > 0; i--) {
const grade = pickWeight(rate, rng)! ?? 0
const set = map.get(grade)!
@@ -105,12 +109,16 @@ function chainReplace(t: Talent['id'], ts: Set<Talent['id']>, rng?: RNG) {
if (!r) return null
let picked: Talent['id'] | null = null
if (r.talent) {
const filtered = r.talent.filter(([id]) => exclude(id, ts) == null)
const filtered = r.talent.filter(([id]) => {
if (ts.has(id)) return false
return exclude(id, ts) == null
})
picked = pickWeight(filtered, rng)
} else if (r.grade) {
const filtered = GradeMap.get(r.grade)!.filter(
id => exclude(id, ts) == null,
)
const filtered = GradeMap.get(r.grade)!.filter(id => {
if (ts.has(id)) return false
return exclude(id, ts) == null
})
picked = pick(filtered, rng)
}
if (!picked) return null