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.

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

Release 0.9.9.35 #667

Merged
merged 4 commits into from
Apr 22, 2024
Merged

Release 0.9.9.35 #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f376858
Release 0.9.9.35
AlexMacocian Apr 22, 2024
c75b527
Item modifiers improvements (#664)
AlexMacocian Apr 22, 2024
3af7306
Floodplains of Mahnkelon id (Closes #653) (#665)
AlexMacocian Apr 22, 2024
5ebf751
Fix exception when extracting maximized minimap (Closes #662) (#666)
AlexMacocian Apr 22, 2024
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
2 changes: 1 addition & 1 deletion Daybreak/Daybreak.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<LangVersion>preview</LangVersion>
<ApplicationIcon>Daybreak.ico</ApplicationIcon>
<IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
<Version>0.9.9.34</Version>
<Version>0.9.9.35</Version>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<UserSecretsId>cfb2a489-db80-448d-a969-80270f314c46</UserSecretsId>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
Expand Down
6 changes: 3 additions & 3 deletions Daybreak/Models/Guildwars/Inscription.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ public sealed class Inscription : ItemBase, IWikiEntity, IIconUrlEntity

public static readonly Inscription FocusOrShieldInscription = new() { Id = 15541, Name = "Focus Items or Shields Inscription", WikiUrl = "https://wiki.guildwars.com/wiki/Inscription", IconUrl = "https://wiki.guildwars.com/images/6/61/Inscription_focus_items_or_shields.png" };

public static IReadOnlyList<Inscription> Inscriptions { get; } = new List<Inscription>
{
public static IReadOnlyList<Inscription> Inscriptions { get; } =
[
WeaponInscription,
FocusInscription,
FocusOrShieldInscription
};
];

public string? WikiUrl { get; init; }

Expand Down
2 changes: 1 addition & 1 deletion Daybreak/Models/Guildwars/ItemBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static bool TryParse(int id, IEnumerable<ItemModifier>? modifiers, out It
i.Modifiers is not null)
{
return i.Modifiers.Count() == modifiers.Count() &&
i.Modifiers.All(modifiers.Contains);
i.Modifiers.All(i1 => modifiers.Any(i2 => i1.Modifier == i2.Modifier));
}
else if (i.Modifiers is not null)
{
Expand Down
2 changes: 2 additions & 0 deletions Daybreak/Models/Guildwars/Map.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ public sealed class Map : IWikiEntity
public static readonly Map YohlonHavenOutpost = new() { Id = 381, Name = "Yohlon Haven", WikiUrl = "https://wiki.guildwars.com/wiki/Yohlon_Haven" };
public static readonly Map GandaraTheMoonFortress = new() { Id = 382, Name = "Gandara", WikiUrl = "https://wiki.guildwars.com/wiki/Gandara" };
public static readonly Map TheFloodplainOfMahnkelon = new() { Id = 383, Name = "The Floodplain of Mahnkelon", WikiUrl = "https://wiki.guildwars.com/wiki/The_Floodplain_of_Mahnkelon" };
public static readonly Map TheFloodplainOfMahnkelon2 = new() { Id = 384, Name = "The Floodplain of Mahnkelon", WikiUrl = "https://wiki.guildwars.com/wiki/The_Floodplain_of_Mahnkelon" };
public static readonly Map LionsArchSunspearsinKryta = new() { Id = 385, Name = "Lion's Arch", WikiUrl = "https://wiki.guildwars.com/wiki/Lion's_Arch" };
public static readonly Map TuraisProcession = new() { Id = 386, Name = "Turai's Procession", WikiUrl = "https://wiki.guildwars.com/wiki/Turai's_Procession" };
public static readonly Map SunspearSanctuaryOutpost = new() { Id = 387, Name = "Sunspear Sanctuary", WikiUrl = "https://wiki.guildwars.com/wiki/Sunspear_Sanctuary" };
Expand Down Expand Up @@ -1058,6 +1059,7 @@ public sealed class Map : IWikiEntity
YohlonHavenOutpost,
GandaraTheMoonFortress,
TheFloodplainOfMahnkelon,
TheFloodplainOfMahnkelon2,
LionsArchSunspearsinKryta,
TuraisProcession,
SunspearSanctuaryOutpost,
Expand Down
366 changes: 183 additions & 183 deletions Daybreak/Models/Guildwars/Rune.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Daybreak/Services/PriceChecker/CheckerModules/RuneIdentifierModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ internal sealed class RuneIdentifierModule : IIdentifierModule
{ 0x24080214, Rune.RuneOfRestoration },
{ 0x24080215, Rune.RuneOfClarity },
{ 0x24080216, Rune.RuneOfPurity },
{ 0x240800FF, Rune.RuneOfMinorVigor },
{ 0x240800C2, Rune.RuneOfMinorVigor },
{ 0x24080101, Rune.RuneOfSuperiorVigor },
{ 0x24080100, Rune.RuneOfMajorVigor },
{ 0x24080212, Rune.RuneOfVitae },
Expand Down
5 changes: 5 additions & 0 deletions Daybreak/Views/FocusView.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,11 @@ private void MinimapExtractButton_Clicked(object sender, EventArgs e)
return;
}

if (this.minimapMaximized)
{
this.GuildwarsMinimap_MaximizeClicked(sender, e);
}

this.minimapWindow = new()
{
Resources = this.Resources,
Expand Down
Loading