Skip to content

Adjusted to be an Array #1

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.

Sign up for GitHub

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

Open
cmarabate wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Adjusted to be an Array #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 16 additions & 15 deletions Account/ModelExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,21 +284,22 @@ public static HeroForm ToModel(this SharedModel.Meta.Heroes.HeroForm form)
}

public static HeroType ToModel(this SharedModel.Meta.Heroes.HeroType type)
{
SharedModel.Meta.Heroes.HeroVisualInfo? firstAvatar = type.VisualInfosBySkinId?.FirstOrDefault().Value;
return new HeroType()
{
Affinity = (Enums.Element)type.Element,
Ascended = type.Id % 10,
Faction = (Enums.HeroFraction)type.Fraction,
Name = type.Name.ToModel(),
ShortName = type.ShortName?.ToModel() ?? type.Name.ToModel(),
Rarity = (Enums.HeroRarity)type.Rarity,
LeaderSkill = type.LeaderSkill?.ToModel(),
TypeId = type.Id,
Forms = type.Forms.Select(ToModel).ToArray()
};
}
{
SharedModel.Meta.Heroes.HeroVisualInfo? firstAvatar = type.VisualInfosBySkinId?.FirstOrDefault().Value;
return new HeroType()
{
Affinity = (Enums.Element)type.Element,
Ascended = type.Id % 10,
Faction = (Enums.HeroFraction)type.Fraction,
Name = type.Name.ToModel(),
ShortName = type.ShortName?.ToModel() ?? type.Name.ToModel(),
Rarity = (Enums.HeroRarity)type.Rarity,
LeaderSkill = type.LeaderSkill?.Select(ls => ls.ToModel()).ToArray() ?? Array.Empty<LeaderStatBonus>(),
TypeId = type.Id,
Forms = type.Forms.Select(f => f.ToModel()).ToArray()
};
}


public static LeaderStatBonus ToModel(this SharedModel.Meta.Skills.LeaderSkill skill)
{
Expand Down
2 changes: 1 addition & 1 deletion Client/Node/src/Types/HeroType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export interface HeroType {
faction: Faction;
rarity: Rarity;
ascended: number;
leaderSkill: LeaderStatBonus;
leaderSkill: LeaderStatBonus[];
brain: string;
forms: HeroForm[];
}
Expand Down