Android build v1.1.9
This commit is contained in:
+151
-10
@@ -17,6 +17,7 @@ import type {
|
||||
LootRoll,
|
||||
Item,
|
||||
EquipmentSlot,
|
||||
PetAward,
|
||||
} from './profile'
|
||||
|
||||
export type GameMode = 'online' | 'offline'
|
||||
@@ -64,6 +65,14 @@ export interface GameRepository {
|
||||
difficultyId: number,
|
||||
runToken: string,
|
||||
): Promise<LootRoll>
|
||||
recordBossKill(
|
||||
encounterId: number,
|
||||
options?: { petVariant?: 'normal' | 'purple' },
|
||||
): Promise<{
|
||||
profile: CharacterProfile
|
||||
petAwarded: PetAward | null
|
||||
}>
|
||||
recordPvpMatch(won: boolean): Promise<CharacterProfile>
|
||||
}
|
||||
|
||||
type CharacterData = {
|
||||
@@ -76,7 +85,7 @@ type CharacterData = {
|
||||
}
|
||||
|
||||
type OfflineSave = {
|
||||
version: 3
|
||||
version: 4
|
||||
characterName: string
|
||||
activeClassId: number
|
||||
completedDungeonParts: number
|
||||
@@ -84,6 +93,10 @@ type OfflineSave = {
|
||||
dungeonCompletions?: Record<string, number>
|
||||
characters: Record<number, CharacterData>
|
||||
lootRolls: Record<string, LootRoll>
|
||||
bossKills: Record<string, number>
|
||||
bossPets: Record<string, number>
|
||||
pvpMatchesPlayed: number
|
||||
pvpMatchesWon: number
|
||||
}
|
||||
|
||||
type OnlineCache = {
|
||||
@@ -124,6 +137,7 @@ const catalogBundleKey = 'chronicle.catalog.bundleHash.v1'
|
||||
const authTokenKey = 'chronicle.authToken.v1'
|
||||
const offlineAccount = { id: -1, username: 'Offline' }
|
||||
const ABILITY_SLOT_COUNT = 6
|
||||
const BOSS_PET_DROP_RATE = 1 / 500
|
||||
let activeCatalogCache: CatalogCache | null = null
|
||||
|
||||
function clone<T>(value: T): T {
|
||||
@@ -175,7 +189,7 @@ function upgradeV1Save(v1: { profile: CharacterProfile; lootRolls: Record<string
|
||||
}
|
||||
}
|
||||
return {
|
||||
version: 3,
|
||||
version: 4,
|
||||
characterName: p.character.name,
|
||||
activeClassId: p.character.classId,
|
||||
completedDungeonParts: p.completedDungeonParts,
|
||||
@@ -185,14 +199,33 @@ function upgradeV1Save(v1: { profile: CharacterProfile; lootRolls: Record<string
|
||||
),
|
||||
characters,
|
||||
lootRolls: v1.lootRolls ?? {},
|
||||
bossKills: p.hunterStats?.bossKills ?? {},
|
||||
bossPets: p.hunterStats?.bossPets ?? {},
|
||||
pvpMatchesPlayed: p.hunterStats?.pvpMatchesPlayed ?? 0,
|
||||
pvpMatchesWon: p.hunterStats?.pvpMatchesWon ?? 0,
|
||||
}
|
||||
}
|
||||
|
||||
function upgradeV2Save(v2: Omit<OfflineSave, 'version' | 'completedRaidPhases'> & { version: 2 }): OfflineSave {
|
||||
function upgradeV2Save(v2: Omit<OfflineSave, 'version' | 'completedRaidPhases' | 'bossKills' | 'bossPets' | 'pvpMatchesPlayed' | 'pvpMatchesWon'> & { version: 2 }): OfflineSave {
|
||||
return normalizeSaveAbilitySlots({
|
||||
...v2,
|
||||
version: 3,
|
||||
version: 4,
|
||||
completedRaidPhases: 0,
|
||||
bossKills: {},
|
||||
bossPets: {},
|
||||
pvpMatchesPlayed: 0,
|
||||
pvpMatchesWon: 0,
|
||||
})
|
||||
}
|
||||
|
||||
function upgradeV3Save(v3: Omit<OfflineSave, 'version' | 'bossKills' | 'bossPets' | 'pvpMatchesPlayed' | 'pvpMatchesWon'> & { version: 3 }): OfflineSave {
|
||||
return normalizeSaveAbilitySlots({
|
||||
...v3,
|
||||
version: 4,
|
||||
bossKills: {},
|
||||
bossPets: {},
|
||||
pvpMatchesPlayed: 0,
|
||||
pvpMatchesWon: 0,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -224,9 +257,12 @@ function normalizeOfflineSave(raw: unknown): OfflineSave | null {
|
||||
profile?: CharacterProfile
|
||||
lootRolls?: Record<string, LootRoll>
|
||||
}
|
||||
if (candidate.version === 3) return normalizeSaveAbilitySlots(candidate as OfflineSave)
|
||||
if (candidate.version === 4) return normalizeSaveAbilitySlots(candidate as OfflineSave)
|
||||
if (candidate.version === 3) {
|
||||
return upgradeV3Save(candidate as Omit<OfflineSave, 'version' | 'bossKills' | 'bossPets' | 'pvpMatchesPlayed' | 'pvpMatchesWon'> & { version: 3 })
|
||||
}
|
||||
if (candidate.version === 2) {
|
||||
return upgradeV2Save(candidate as Omit<OfflineSave, 'version' | 'completedRaidPhases'> & { version: 2 })
|
||||
return upgradeV2Save(candidate as Omit<OfflineSave, 'version' | 'completedRaidPhases' | 'bossKills' | 'bossPets' | 'pvpMatchesPlayed' | 'pvpMatchesWon'> & { version: 2 })
|
||||
}
|
||||
if (candidate.version === 1 && candidate.profile) {
|
||||
return normalizeSaveAbilitySlots(upgradeV1Save(candidate as { profile: CharacterProfile; lootRolls: Record<string, LootRoll> }))
|
||||
@@ -241,7 +277,7 @@ function readSaveKey(key: string): OfflineSave | null {
|
||||
const raw = JSON.parse(serialized)
|
||||
const save = normalizeOfflineSave(raw)
|
||||
if (!save) return null
|
||||
if (raw.version !== 3) {
|
||||
if (raw.version !== 4) {
|
||||
localStorage.setItem(key, JSON.stringify(save))
|
||||
}
|
||||
return save
|
||||
@@ -284,7 +320,7 @@ function readOnlineCache(): OnlineCache | null {
|
||||
save,
|
||||
dirty: Boolean(raw.dirty),
|
||||
}
|
||||
if ((raw.save as { version?: number } | undefined)?.version !== 3) {
|
||||
if ((raw.save as { version?: number } | undefined)?.version !== 4) {
|
||||
writeOnlineCache(cache)
|
||||
}
|
||||
return cache
|
||||
@@ -380,6 +416,12 @@ function buildProfile(save: OfflineSave): CharacterProfile {
|
||||
...dungeon,
|
||||
completionCount: save.dungeonCompletions?.[String(dungeon.id)] ?? dungeon.completionCount ?? 0,
|
||||
}))
|
||||
static_.hunterStats = {
|
||||
bossKills: clone(save.bossKills ?? {}),
|
||||
bossPets: clone(save.bossPets ?? {}),
|
||||
pvpMatchesPlayed: save.pvpMatchesPlayed ?? 0,
|
||||
pvpMatchesWon: save.pvpMatchesWon ?? 0,
|
||||
}
|
||||
|
||||
return static_
|
||||
}
|
||||
@@ -547,7 +589,7 @@ function mergeProfileIntoSave(profile: CharacterProfile, existingSave?: OfflineS
|
||||
inventory: clone(profile.inventory),
|
||||
}
|
||||
return {
|
||||
version: 3,
|
||||
version: 4,
|
||||
characterName: profile.character.name,
|
||||
activeClassId: profile.character.classId,
|
||||
completedDungeonParts: profile.completedDungeonParts,
|
||||
@@ -557,6 +599,10 @@ function mergeProfileIntoSave(profile: CharacterProfile, existingSave?: OfflineS
|
||||
),
|
||||
characters,
|
||||
lootRolls: clone(existingSave?.lootRolls ?? {}),
|
||||
bossKills: clone(profile.hunterStats?.bossKills ?? existingSave?.bossKills ?? {}),
|
||||
bossPets: clone(profile.hunterStats?.bossPets ?? existingSave?.bossPets ?? {}),
|
||||
pvpMatchesPlayed: profile.hunterStats?.pvpMatchesPlayed ?? existingSave?.pvpMatchesPlayed ?? 0,
|
||||
pvpMatchesWon: profile.hunterStats?.pvpMatchesWon ?? existingSave?.pvpMatchesWon ?? 0,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -570,6 +616,50 @@ function rollWeightedLootEntry<T extends { dropWeight: number }>(entries: T[]):
|
||||
return entries[entries.length - 1]
|
||||
}
|
||||
|
||||
function bossPetName(encounterName: string) {
|
||||
return `${encounterName} Pet`
|
||||
}
|
||||
|
||||
function purpleBossPetName(encounterName: string) {
|
||||
return `Purple ${encounterName} Pet`
|
||||
}
|
||||
|
||||
function maybeAwardBossPet(
|
||||
save: OfflineSave,
|
||||
encounter: { id: number; enemyName: string },
|
||||
variant: 'normal' | 'purple' = 'normal',
|
||||
): PetAward | null {
|
||||
if (Math.random() >= BOSS_PET_DROP_RATE) return null
|
||||
const key = variant === 'purple' ? `purple:${encounter.id}` : String(encounter.id)
|
||||
const previousQuantity = save.bossPets?.[key] ?? 0
|
||||
save.bossPets = {
|
||||
...(save.bossPets ?? {}),
|
||||
[key]: previousQuantity + 1,
|
||||
}
|
||||
return {
|
||||
encounterId: encounter.id,
|
||||
petName: variant === 'purple'
|
||||
? purpleBossPetName(encounter.enemyName)
|
||||
: bossPetName(encounter.enemyName),
|
||||
quantity: 1,
|
||||
duplicate: previousQuantity > 0,
|
||||
quantityAfter: previousQuantity + 1,
|
||||
}
|
||||
}
|
||||
|
||||
function recordBossKillInSave(
|
||||
save: OfflineSave,
|
||||
encounter: { id: number; enemyName: string },
|
||||
options?: { petVariant?: 'normal' | 'purple' },
|
||||
): PetAward | null {
|
||||
const key = String(encounter.id)
|
||||
save.bossKills = {
|
||||
...(save.bossKills ?? {}),
|
||||
[key]: (save.bossKills?.[key] ?? 0) + 1,
|
||||
}
|
||||
return maybeAwardBossPet(save, encounter, options?.petVariant ?? 'normal')
|
||||
}
|
||||
|
||||
function awardRoguelikeCoin(
|
||||
profile: CharacterProfile,
|
||||
sourceEncounterId: number | undefined,
|
||||
@@ -885,6 +975,10 @@ const serverRepository: GameRepository = {
|
||||
cachedOnlineLocalRepository.upgradeItem(itemId),
|
||||
rollEncounterLoot: (encounterId, difficultyId, runToken) =>
|
||||
cachedOnlineLocalRepository.rollEncounterLoot(encounterId, difficultyId, runToken),
|
||||
recordBossKill: (encounterId, options) =>
|
||||
cachedOnlineLocalRepository.recordBossKill(encounterId, options),
|
||||
recordPvpMatch: (won) =>
|
||||
cachedOnlineLocalRepository.recordPvpMatch(won),
|
||||
}
|
||||
|
||||
function emptyCharacterData(classId: number): CharacterData {
|
||||
@@ -1172,6 +1266,17 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
|
||||
profile.maxTalentPoints,
|
||||
cd.talentPoints + levelsGained,
|
||||
)
|
||||
let petAwarded: PetAward | null = null
|
||||
if (options?.lootSourceEncounterId) {
|
||||
const sourceEncounter = profile.dungeons
|
||||
.flatMap((candidate) => candidate.encounters)
|
||||
.find((candidate) => candidate.id === options.lootSourceEncounterId && candidate.isBoss)
|
||||
if (sourceEncounter) {
|
||||
petAwarded = recordBossKillInSave(save, sourceEncounter, {
|
||||
petVariant: 'purple',
|
||||
})
|
||||
}
|
||||
}
|
||||
const bonusItem = awardRoguelikeCoin(
|
||||
profile,
|
||||
options?.lootSourceEncounterId,
|
||||
@@ -1196,6 +1301,7 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
|
||||
averageItemLevel: updatedProfile.gearStats.averageItemLevel,
|
||||
unlockedAbilities,
|
||||
bonusItem,
|
||||
petAwarded,
|
||||
profile: updatedProfile,
|
||||
}
|
||||
},
|
||||
@@ -1446,6 +1552,9 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
|
||||
throw new Error('This encounter has no configured loot.')
|
||||
}
|
||||
const dropChance = entries[0].dropChance
|
||||
const petAwarded = encounter.isBoss
|
||||
? recordBossKillInSave(save, encounter)
|
||||
: null
|
||||
const items: LootRoll['items'] = []
|
||||
|
||||
const selectedQuantities = new Map<number, { entry: typeof entries[number]; quantity: number }>()
|
||||
@@ -1497,12 +1606,36 @@ function createLocalRepository(store: LocalSaveStore): GameRepository {
|
||||
awarded: Boolean(item),
|
||||
duplicate: items.some((candidate) => candidate.duplicate),
|
||||
quantityAfter: item?.quantityAfter ?? 0,
|
||||
petAwarded,
|
||||
}
|
||||
save.lootRolls[rollKey] = result
|
||||
save.characters[save.activeClassId].inventory = profile.inventory
|
||||
store.writeSave(save)
|
||||
return clone(result)
|
||||
},
|
||||
async recordBossKill(encounterId, options) {
|
||||
const save = requireStoredSave(store)
|
||||
const profile = buildProfile(save)
|
||||
const encounter = profile.dungeons
|
||||
.flatMap((dungeon) => dungeon.encounters)
|
||||
.find((candidate) => candidate.id === encounterId && candidate.isBoss)
|
||||
if (!encounter) throw new Error('Boss encounter not found.')
|
||||
const petAwarded = recordBossKillInSave(save, encounter, {
|
||||
petVariant: options?.petVariant ?? 'normal',
|
||||
})
|
||||
store.writeSave(save)
|
||||
return {
|
||||
profile: buildProfile(save),
|
||||
petAwarded,
|
||||
}
|
||||
},
|
||||
async recordPvpMatch(won) {
|
||||
const save = requireStoredSave(store)
|
||||
save.pvpMatchesPlayed = (save.pvpMatchesPlayed ?? 0) + 1
|
||||
if (won) save.pvpMatchesWon = (save.pvpMatchesWon ?? 0) + 1
|
||||
store.writeSave(save)
|
||||
return buildProfile(save)
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1581,6 +1714,10 @@ const cachedOnlineRepository: GameRepository = {
|
||||
upgradeItem: (itemId) => cachedOnlineLocalRepository.upgradeItem(itemId),
|
||||
rollEncounterLoot: (encounterId, difficultyId, runToken) =>
|
||||
cachedOnlineLocalRepository.rollEncounterLoot(encounterId, difficultyId, runToken),
|
||||
recordBossKill: (encounterId, options) =>
|
||||
cachedOnlineLocalRepository.recordBossKill(encounterId, options),
|
||||
recordPvpMatch: (won) =>
|
||||
cachedOnlineLocalRepository.recordPvpMatch(won),
|
||||
}
|
||||
|
||||
export function getGameMode(): GameMode {
|
||||
@@ -1627,13 +1764,17 @@ export function createOfflineCharacter(characterName: string): AuthSession {
|
||||
characters[cid] = emptyCharacterData(cid)
|
||||
}
|
||||
const save: OfflineSave = {
|
||||
version: 3,
|
||||
version: 4,
|
||||
characterName: name,
|
||||
activeClassId: 1,
|
||||
completedDungeonParts: 0,
|
||||
completedRaidPhases: 0,
|
||||
characters,
|
||||
lootRolls: {},
|
||||
bossKills: {},
|
||||
bossPets: {},
|
||||
pvpMatchesPlayed: 0,
|
||||
pvpMatchesWon: 0,
|
||||
}
|
||||
writeOfflineSave(save)
|
||||
writeMode('offline-local')
|
||||
|
||||
Reference in New Issue
Block a user