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

Release v0.41.0 #392

Merged
merged 8 commits into from
Oct 27, 2024
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
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@


## [0.41.0](https://github.com/DorielRivalet/MHFZ_Overlay/compare/v0.40.0...v0.41.0) (2024-10-27)


### Features

* add hotkeys window ([d25af92](https://github.com/DorielRivalet/MHFZ_Overlay/commit/d25af927216c2561efe8ff352f26d4234d720eb7)), closes [#375](https://github.com/DorielRivalet/MHFZ_Overlay/issues/375)
* **database:** add party size dictionary ([20f34ab](https://github.com/DorielRivalet/MHFZ_Overlay/commit/20f34abd3d9f8d7d8b939a91a950d3170f198aa1)), closes [#388](https://github.com/DorielRivalet/MHFZ_Overlay/issues/388)
* **database:** reduce database size ([e30aacd](https://github.com/DorielRivalet/MHFZ_Overlay/commit/e30aacdcf5d9d4df46c78ab98dee54ba33cb3614)), closes [#389](https://github.com/DorielRivalet/MHFZ_Overlay/issues/389)
* update monster images ([ed67b0e](https://github.com/DorielRivalet/MHFZ_Overlay/commit/ed67b0ea0146d468e02f9372671524e95ff3a33f))


### Bug Fixes

* **achievement:** fix ds achievements ([eb66abe](https://github.com/DorielRivalet/MHFZ_Overlay/commit/eb66abe45ae18ce93a1572fbe2bb2efdf89742d6)), closes [#390](https://github.com/DorielRivalet/MHFZ_Overlay/issues/390)


### For Developers

* bump version ([5c670a2](https://github.com/DorielRivalet/MHFZ_Overlay/commit/5c670a2f211656d8038200d26161034213be09ee))
* **deps:** bump braces from 3.0.2 to 3.0.3 ([1c1bf79](https://github.com/DorielRivalet/MHFZ_Overlay/commit/1c1bf7994fafd172d208fb0525c8318f0e143fc3))
* update README.md ([31b1db2](https://github.com/DorielRivalet/MHFZ_Overlay/commit/31b1db2299781a523c7ecac56866a6ef1a0afa2b))

## [0.40.0](https://github.com/DorielRivalet/MHFZ_Overlay/compare/v0.39.1...v0.40.0) (2024-06-19)


Expand Down
9 changes: 9 additions & 0 deletions MHFZ_Overlay/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -1044,6 +1044,15 @@
<setting name="EnableAchievementsTracking" serializeAs="String">
<value>True</value>
</setting>
<setting name="OpenSettingsHotkey" serializeAs="String">
<value>Shift + F1</value>
</setting>
<setting name="RestartProgramHotkey" serializeAs="String">
<value>Shift + F5</value>
</setting>
<setting name="CloseProgramHotkey" serializeAs="String">
<value>Shift + F6</value>
</setting>
</MHFZ_Overlay.Settings>
</userSettings>
</configuration>
Binary file modified MHFZ_Overlay/Assets/Icons/png/monster/azure_rathalos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified MHFZ_Overlay/Assets/Icons/png/monster/conquest_shantien.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified MHFZ_Overlay/Assets/Icons/png/monster/disufiroa.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified MHFZ_Overlay/Assets/Icons/png/monster/gold_rathian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified MHFZ_Overlay/Assets/Icons/png/monster/pink_rathian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified MHFZ_Overlay/Assets/Icons/png/monster/rathalos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified MHFZ_Overlay/Assets/Icons/png/monster/rathian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified MHFZ_Overlay/Assets/Icons/png/monster/shantien.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified MHFZ_Overlay/Assets/Icons/png/monster/shiten_disufiroa.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified MHFZ_Overlay/Assets/Icons/png/monster/shiten_unknown.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified MHFZ_Overlay/Assets/Icons/png/monster/silver_rathalos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified MHFZ_Overlay/Assets/Icons/png/monster/unknown.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
38 changes: 19 additions & 19 deletions MHFZ_Overlay/MHFZ_Overlay.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<Product>MHFZ Overlay</Product>
<Copyright>Doriel Rivalet</Copyright>
<Authors>Doriel Rivalet</Authors>
<Version>0.40.0</Version>
<Version>0.41.0</Version>
<PackageProjectUrl>https://github.com/DorielRivalet/mhfz-overlay</PackageProjectUrl>
<RepositoryUrl>https://github.com/DorielRivalet/mhfz-overlay.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
Expand Down Expand Up @@ -2001,44 +2001,44 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
<PackageReference Include="CompiledBindings.WPF" Version="1.0.18" />
<PackageReference Include="CsvHelper" Version="32.0.3" />
<PackageReference Include="CsvHelper" Version="33.0.1" />
<PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
<PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.115" />
<PackageReference Include="EZlion" Version="8.0.0" />
<PackageReference Include="FontAwesome.Sharp" Version="6.3.0" />
<PackageReference Include="FontAwesome.Sharp" Version="6.6.0" />
<PackageReference Include="LiveChartsCore.SkiaSharpView.WPF" Version="2.0.0-beta.920" />
<PackageReference Include="MathNet.Numerics" Version="5.0.0" />
<PackageReference Include="Memory.dll.x86" Version="1.2.27" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
<PackageReference Include="MouseKeyHook" Version="5.7.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.3.2" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.11" />
<PackageReference Include="NuGet.CommandLine" Version="6.10.0">
<PackageReference Include="NLog" Version="5.3.4" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.14" />
<PackageReference Include="NuGet.CommandLine" Version="6.11.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Octokit" Version="12.0.0" />
<PackageReference Include="RESTCountries.NET" Version="3.1.0" />
<PackageReference Include="Octokit" Version="13.0.1" />
<PackageReference Include="RESTCountries.NET" Version="3.2.0" />
<PackageReference Include="ShowMeTheXAML.MSBuild" Version="2.0.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
<PackageReference Include="System.Drawing.Common" Version="8.0.6" />
<PackageReference Include="Velopack" Version="0.0.359" />
<PackageReference Include="VirtualizingWrapPanel" Version="2.0.6" />
<PackageReference Include="WPF-UI" Version="3.0.4" />
<PackageReference Include="WPF-UI.Tray" Version="3.0.4" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
<PackageReference Include="System.Drawing.Common" Version="8.0.10" />
<PackageReference Include="Velopack" Version="0.0.626" />
<PackageReference Include="VirtualizingWrapPanel" Version="2.0.11" />
<PackageReference Include="WPF-UI" Version="3.0.5" />
<PackageReference Include="WPF-UI.Tray" Version="3.0.5" />
<PackageReference Include="WpfAnimatedGif" Version="2.0.2" />
<PackageReference Include="XamlAnimatedGif" Version="2.3.0" />
<PackageReference Include="XInputium" Version="1.2.0" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit" Version="2.9.2" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions MHFZ_Overlay/Models/Collections/Achievements.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6260,7 +6260,7 @@ [] [U] [] [] []
Description = string.Empty,
Rank = AchievementRank.Platinum,
Image = @"pack://application:,,,/MHFZ_Overlay;component/Assets/Icons/png/weapon/Dual_Blades_Icon_White.png",
Objective = "Defeat Lv9999 Conquest Shantien solo with Dual Swords without dropping the combo (maximum sharpening buff, Speedrun mode).",
Objective = "Defeat Lv9999 Conquest Shantien solo with Dual Swords without dropping the combo more than 3 times (maximum sharpening buff, Speedrun mode).",
IsSecret = false,
Hint = string.Empty,
}
Expand All @@ -6286,7 +6286,7 @@ [] [U] [] [] []
Description = string.Empty,
Rank = AchievementRank.Platinum,
Image = @"pack://application:,,,/MHFZ_Overlay;component/Assets/Icons/png/weapon/Dual_Blades_Icon_White.png",
Objective = "Defeat Upper Shiten Disufiroa solo with Dual Swords without dropping the combo (maximum sharpening buff, Speedrun mode).",
Objective = "Defeat Upper Shiten Disufiroa solo with Dual Swords without dropping the combo more than 3 times (maximum sharpening buff, Speedrun mode).",
IsSecret = false,
Hint = string.Empty,
}
Expand Down
3 changes: 3 additions & 0 deletions MHFZ_Overlay/Models/Quest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace MHFZ_Overlay.Models;

using System;
using System.Collections.Generic;

// TODO: ORM
// get the graphs from here
Expand Down Expand Up @@ -86,4 +87,6 @@ public sealed class Quest

public long? PartySize { get; set; } = 0;

public string? PartySizeDictionary { get; set; } = string.Empty;

}
4 changes: 2 additions & 2 deletions MHFZ_Overlay/Services/AchievementService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3111,7 +3111,7 @@ join styleRankSkills in databaseManagerInstance.AllStyleRankSkills on quest.RunI
return false;
}

if (databaseManagerInstance.AllQuestsWeaponBuffs.Any(q => q.RunID == foundConquestShantienQuest.First().RunID && q.DualSwordsSharpensDictionary.Count == 4 && q.DualSwordsSharpensDictionary.Count((e) => e.Value == 0) == 0))
if (databaseManagerInstance.AllQuestsWeaponBuffs.Any(q => q.RunID == foundConquestShantienQuest.First().RunID && q.DualSwordsSharpensDictionary.Count >= 4 && q.DualSwordsSharpensDictionary.Count((e) => e.Value == 0) <= 3))
{
return true;
}
Expand Down Expand Up @@ -3151,7 +3151,7 @@ join styleRankSkills in databaseManagerInstance.AllStyleRankSkills on quest.RunI
return false;
}

if (databaseManagerInstance.AllQuestsWeaponBuffs.Any(q => q.RunID == foundUpperShitenDisufiroaQuest.First().RunID && q.DualSwordsSharpensDictionary.Count == 4 && q.DualSwordsSharpensDictionary.Count((e) => e.Value == 0) == 0))
if (databaseManagerInstance.AllQuestsWeaponBuffs.Any(q => q.RunID == foundUpperShitenDisufiroaQuest.First().RunID && q.DualSwordsSharpensDictionary.Count >= 4 && q.DualSwordsSharpensDictionary.Count((e) => e.Value == 0) <= 3))
{
return true;
}
Expand Down
Loading
Loading