Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 5.3 first half content #2585

Merged
merged 4 commits into from
Jan 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions libs/gi/assets-data/src/AssetsData_gen.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -213,13 +213,14 @@ const runExecutor: PromiseExecutor<GenAssetsDataExecutorSchema> = async (

if (candSkillDepotIds.length) {
// Traveler
const [, , hydro, anemo, , geo, electro, dendro] = candSkillDepotIds
const [, pyro, hydro, anemo, , geo, electro, dendro] = candSkillDepotIds
// const gender = characterIdMap[charid] === "TravelerF" ? "F" : "M"
genTalentHash('TravelerAnemo', avatarSkillDepotExcelConfigData[anemo])
genTalentHash('TravelerGeo', avatarSkillDepotExcelConfigData[geo])
genTalentHash('TravelerElectro', avatarSkillDepotExcelConfigData[electro])
genTalentHash('TravelerDendro', avatarSkillDepotExcelConfigData[dendro])
genTalentHash('TravelerHydro', avatarSkillDepotExcelConfigData[hydro])
genTalentHash('TravelerPyro', avatarSkillDepotExcelConfigData[pyro])
} else {
genTalentHash(cKey, avatarSkillDepotExcelConfigData[skillDepotId])
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions libs/gi/assets/src/gen/chars/Citlali/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// This is a generated index file.
import burst from './Skill_E_Citlali_01_HD.png'
import skill from './Skill_S_Citlali_01.png'
import icon from './UI_AvatarIcon_Citlali.png'
import iconSide from './UI_AvatarIcon_Side_Citlali.png'
import bar from './UI_NameCardPic_Citlali_Alpha.png'
import banner from './UI_NameCardPic_Citlali_P.png'
import constellation1 from './UI_Talent_S_Citlali_01.png'
import constellation2 from './UI_Talent_S_Citlali_02.png'
import constellation4 from './UI_Talent_S_Citlali_03.png'
import constellation6 from './UI_Talent_S_Citlali_04.png'
import passive1 from './UI_Talent_S_Citlali_05.png'
import passive2 from './UI_Talent_S_Citlali_06.png'
import passive3 from './UI_Talent_S_Citlali_08.png'
import passive from './UI_Talent_S_Mavuika_08.png'
import constellation3 from './UI_Talent_U_Citlali_01.png'
import constellation5 from './UI_Talent_U_Citlali_02.png'

const data = {
banner,
bar,
burst,
constellation1,
constellation2,
constellation3,
constellation4,
constellation5,
constellation6,
icon,
iconSide,
passive,
passive1,
passive2,
passive3,
skill,
} as const
export default data
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions libs/gi/assets/src/gen/chars/Mavuika/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// This is a generated index file.
import burst from './Skill_E_Mavuika_01_HD.png'
import skill from './Skill_S_Mavuika_01.png'
import icon from './UI_AvatarIcon_Mavuika.png'
import iconSide from './UI_AvatarIcon_Side_Mavuika.png'
import bar from './UI_NameCardPic_Mavuika_Alpha.png'
import banner from './UI_NameCardPic_Mavuika_P.png'
import passive from './UI_Talent_S_Citlali_07.png'
import constellation1 from './UI_Talent_S_Mavuika_01.png'
import constellation2 from './UI_Talent_S_Mavuika_02.png'
import constellation4 from './UI_Talent_S_Mavuika_03.png'
import constellation6 from './UI_Talent_S_Mavuika_04.png'
import passive1 from './UI_Talent_S_Mavuika_05.png'
import passive2 from './UI_Talent_S_Mavuika_06.png'
import passive3 from './UI_Talent_S_Mavuika_07.png'
import constellation3 from './UI_Talent_U_Mavuika_01.png'
import constellation5 from './UI_Talent_U_Mavuika_02.png'

const data = {
banner,
bar,
burst,
constellation1,
constellation2,
constellation3,
constellation4,
constellation5,
constellation6,
icon,
iconSide,
passive,
passive1,
passive2,
passive3,
skill,
} as const
export default data
25 changes: 25 additions & 0 deletions libs/gi/assets/src/gen/chars/TravelerPyro/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// This is a generated index file.
import burst from './Skill_E_PlayerFire_01_HD.png'
import skill from './Skill_S_PlayerFire_01.png'
import constellation1 from './UI_Talent_S_PlayerFire_01.png'
import constellation2 from './UI_Talent_S_PlayerFire_02.png'
import constellation4 from './UI_Talent_S_PlayerFire_03.png'
import constellation6 from './UI_Talent_S_PlayerFire_04.png'
import passive1 from './UI_Talent_S_PlayerFire_05.png'
import passive2 from './UI_Talent_S_PlayerFire_06.png'
import constellation3 from './UI_Talent_U_PlayerFire_01.png'
import constellation5 from './UI_Talent_U_PlayerFire_02.png'

const data = {
burst,
constellation1,
constellation2,
constellation3,
constellation4,
constellation5,
constellation6,
passive1,
passive2,
skill,
} as const
export default data
6 changes: 6 additions & 0 deletions libs/gi/assets/src/gen/chars/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import Chasca from './Chasca'
import Chevreuse from './Chevreuse'
import Chiori from './Chiori'
import Chongyun from './Chongyun'
import Citlali from './Citlali'
import Clorinde from './Clorinde'
import Collei from './Collei'
import Cyno from './Cyno'
Expand Down Expand Up @@ -49,6 +50,7 @@ import Layla from './Layla'
import Lisa from './Lisa'
import Lynette from './Lynette'
import Lyney from './Lyney'
import Mavuika from './Mavuika'
import Mika from './Mika'
import Mona from './Mona'
import Mualani from './Mualani'
Expand Down Expand Up @@ -81,6 +83,7 @@ import TravelerF from './TravelerF'
import TravelerGeo from './TravelerGeo'
import TravelerHydro from './TravelerHydro'
import TravelerM from './TravelerM'
import TravelerPyro from './TravelerPyro'
import Venti from './Venti'
import Wanderer from './Wanderer'
import Wriothesley from './Wriothesley'
Expand Down Expand Up @@ -115,6 +118,7 @@ const data = {
Chevreuse,
Chiori,
Chongyun,
Citlali,
Clorinde,
Collei,
Cyno,
Expand Down Expand Up @@ -149,6 +153,7 @@ const data = {
Lisa,
Lynette,
Lyney,
Mavuika,
Mika,
Mona,
Mualani,
Expand Down Expand Up @@ -181,6 +186,7 @@ const data = {
TravelerGeo,
TravelerHydro,
TravelerM,
TravelerPyro,
Venti,
Wanderer,
Wriothesley,
Expand Down
9 changes: 9 additions & 0 deletions libs/gi/assets/src/gen/weapons/AThousandBlazingSuns/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// This is a generated index file.
import icon from './UI_EquipIcon_Claymore_RadianceSword.png'
import awakenIcon from './UI_EquipIcon_Claymore_RadianceSword_Awaken.png'

const data = {
awakenIcon,
icon,
} as const
export default data
9 changes: 9 additions & 0 deletions libs/gi/assets/src/gen/weapons/StarcallersWatch/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// This is a generated index file.
import icon from './UI_EquipIcon_Catalyst_Figurines.png'
import awakenIcon from './UI_EquipIcon_Catalyst_Figurines_Awaken.png'

const data = {
awakenIcon,
icon,
} as const
export default data
4 changes: 4 additions & 0 deletions libs/gi/assets/src/gen/weapons/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import AquaSimulacra from './AquaSimulacra'
import AquilaFavonia from './AquilaFavonia'
import AshGravenDrinkingHorn from './AshGravenDrinkingHorn'
import AstralVulturesCrimsonPlumage from './AstralVulturesCrimsonPlumage'
import AThousandBlazingSuns from './AThousandBlazingSuns'
import AThousandFloatingDreams from './AThousandFloatingDreams'
import BalladOfTheBoundlessBlue from './BalladOfTheBoundlessBlue'
import BalladOfTheFjords from './BalladOfTheFjords'
Expand Down Expand Up @@ -161,6 +162,7 @@ import SongOfStillness from './SongOfStillness'
import SplendorOfTranquilWaters from './SplendorOfTranquilWaters'
import StaffOfHoma from './StaffOfHoma'
import StaffOfTheScarletSands from './StaffOfTheScarletSands'
import StarcallersWatch from './StarcallersWatch'
import SturdyBone from './SturdyBone'
import SummitShaper from './SummitShaper'
import SurfsUp from './SurfsUp'
Expand Down Expand Up @@ -204,6 +206,7 @@ import WolfsGravestone from './WolfsGravestone'
import XiphosMoonlight from './XiphosMoonlight'

const data = {
AThousandBlazingSuns,
AThousandFloatingDreams,
Absolution,
Akuoumaru,
Expand Down Expand Up @@ -366,6 +369,7 @@ const data = {
SplendorOfTranquilWaters,
StaffOfHoma,
StaffOfTheScarletSands,
StarcallersWatch,
SturdyBone,
SummitShaper,
SurfsUp,
Expand Down
Binary file added libs/gi/char-cards/src/Character_Citlali_Card.jpg
Binary file added libs/gi/char-cards/src/Character_Mavuika_Card.jpg
5 changes: 5 additions & 0 deletions libs/gi/char-cards/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import Chasca from './Character_Chasca_Card.jpg'
import Chevreuse from './Character_Chevreuse_Card.jpg'
import Chiori from './Character_Chiori_Card.jpg'
import Chongyun from './Character_Chongyun_Card.jpg'
import Citlali from './Character_Citlali_Card.jpg'
import Clorinde from './Character_Clorinde_Card.jpg'
import Collei from './Character_Collei_Card.jpg'
import Cyno from './Character_Cyno_Card.jpg'
Expand Down Expand Up @@ -49,6 +50,7 @@ import Layla from './Character_Layla_Card.jpeg'
import Lisa from './Character_Lisa_Card.jpg'
import Lynette from './Character_Lynette_Card.jpg'
import Lyney from './Character_Lyney_Card.jpg'
import Mavuika from './Character_Mavuika_Card.jpg'
import Mika from './Character_Mika_Card.jpg'
import Mona from './Character_Mona_Card.jpg'
import Mualani from './Character_Mualani_Card.jpg'
Expand Down Expand Up @@ -110,6 +112,7 @@ const charCards = {
Chevreuse,
Chiori,
Chongyun,
Citlali,
Clorinde,
Collei,
Cyno,
Expand Down Expand Up @@ -144,6 +147,7 @@ const charCards = {
Lisa,
Lyney,
Lynette,
Mavuika,
Mika,
Mona,
Mualani,
Expand Down Expand Up @@ -196,6 +200,7 @@ export function charCard(charKey: CharacterKey, gender: GenderKey) {
case 'TravelerElectro':
case 'TravelerGeo':
case 'TravelerHydro':
case 'TravelerPyro':
return charCards[`Traveler${gender}`]
default:
return charCards[charKey]
Expand Down
7 changes: 7 additions & 0 deletions libs/gi/consts/src/character.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export const nonTravelerCharacterKeys = [
'Chevreuse',
'Chiori',
'Chongyun',
'Citlali',
'Clorinde',
'Collei',
'Cyno',
Expand Down Expand Up @@ -117,6 +118,7 @@ export const nonTravelerCharacterKeys = [
'Lisa',
'Lynette',
'Lyney',
'Mavuika',
'Mika',
'Mona',
'Mualani',
Expand Down Expand Up @@ -167,6 +169,7 @@ export const travelerElements = [
'electro',
'dendro',
'hydro',
'pyro',
] as const
export type TravelerElementKey = (typeof travelerElements)[number]

Expand All @@ -176,6 +179,7 @@ export const allTravelerKeys = [
'TravelerElectro',
'TravelerDendro',
'TravelerHydro',
'TravelerPyro',
] as const
export type TravelerKey = (typeof allTravelerKeys)[number]

Expand All @@ -185,6 +189,7 @@ export const travelerEleMap: Partial<Record<ElementKey, TravelerKey>> = {
electro: 'TravelerElectro',
dendro: 'TravelerDendro',
hydro: 'TravelerHydro',
pyro: 'TravelerPyro',
} as const

export const locationGenderedCharacterKeys = [
Expand Down Expand Up @@ -254,13 +259,15 @@ export const travelerFKeys = [
'TravelerElectroF',
'TravelerDendroF',
'TravelerHydroF',
'TravelerPyroF',
] as const
export const travelerMKeys = [
'TravelerAnemoM',
'TravelerGeoM',
'TravelerElectroM',
'TravelerDendroM',
'TravelerHydroM',
'TravelerPyroM',
] as const
export const allCharacterSheetKeys = [
...nonTravelerCharacterKeys,
Expand Down
Loading
Loading