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 #1

Merged
merged 2 commits into from
Sep 29, 2022
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
21 changes: 21 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2022 Doriel Rivalet

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
3 changes: 3 additions & 0 deletions MHFZ_Overlay/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,9 @@
<setting name="DiscordTimerMode" serializeAs="String">
<value>Time Left</value>
</setting>
<setting name="DiscordRoadTimerReset" serializeAs="String">
<value>Never</value>
</setting>
</MHFZ_Overlay.Settings>
</userSettings>
</configuration>
9 changes: 8 additions & 1 deletion MHFZ_Overlay/ConfigWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:local="clr-namespace:MHFZ_Overlay" xmlns:addresses="clr-namespace:MHFZ_Overlay.addresses" d:DataContext="{d:DesignInstance Type=addresses:AddressModel}"
mc:Ignorable="d"
Title="Monster Hunter Frontier Z Overlay Version v0.2.0"
Title="Monster Hunter Frontier Z Overlay Version v0.2.1"
Height="720" Width="1280" ResizeMode="CanMinimize"
Foreground="#cdd6f4"

Expand Down Expand Up @@ -510,6 +510,8 @@
<RowDefinition Height="40"/>
<RowDefinition Height="40"/>
<RowDefinition Height="40"/>
<RowDefinition Height="40"/>
<RowDefinition Height="40"/>
</Grid.RowDefinitions>
<TextBlock Margin="5,5,5,5" ToolTip="Enable Discord Rich Presence" Style="{StaticResource ConfigTextBox}" Grid.Row="0" Grid.Column="0" Text="(Overlay restart required) Rich Presence"/>
<CheckBox Background="#b4befe" Style="{StaticResource ConfigCheckBox}" Grid.Row="0" Grid.Column="1" IsChecked="{Binding Source={StaticResource Settings}, Path=EnableRichPresence}"/>
Expand Down Expand Up @@ -542,6 +544,11 @@
<ComboBoxItem>Time Left</ComboBoxItem>
<ComboBoxItem>Time Elapsed</ComboBoxItem>
</ComboBox>
<TextBlock Margin="5,5,5,5" ToolTip="Reset Time on Floor change (Real-Time)" Style="{StaticResource ConfigTextBox}" Grid.Row="6" Grid.Column="0" Text="Road Timer Reset per Floor"/>
<ComboBox Grid.Column="1" Grid.Row="6" SelectedValuePath="Content" SelectedValue="{Binding Source={StaticResource Settings}, Path=DiscordRoadTimerReset}">
<ComboBoxItem>Never</ComboBoxItem>
<ComboBoxItem>Always</ComboBoxItem>
</ComboBox>
</Grid>
<Grid Grid.Row="1" Grid.ColumnSpan="1" Background="#1e1e2e">
<Grid.ColumnDefinitions>
Expand Down
4 changes: 2 additions & 2 deletions MHFZ_Overlay/Dictionary.cs
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ public class ArmorSkillList
{
public static Dictionary<int, string> ArmorSkillID = new Dictionary<int, string>()
{
{0, ""},
{0, "None"},
{1, "Paralysis Halved"},
{2, "Negate Paralysis"},
{3, "Paralysis Doubled"},
Expand Down Expand Up @@ -1206,7 +1206,7 @@ public class MapAreaList
{333,"Tidal Island Area 3 (Night)" },
{334,"Tidal Island Day Area 4" },
{335,"Tidal Island Day Area 5" },
{336," Tidal Island Day" },
{336,"Tidal Island Day" },
{337,"Tidal Island (Orange Area 5)" },
{338,"Tidal Island Area 4 (Night)" },
{339,"Tidal Island Area 5 (Night)" },
Expand Down
2 changes: 1 addition & 1 deletion MHFZ_Overlay/ItemsDictionary.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class Items

public static void initiate()
{
ItemIDs[0] = "-";
ItemIDs[0] = "None";
ItemIDs[1] = "Book of Combos 1";
ItemIDs[2] = "Book of Combos 2";
ItemIDs[3] = "Book of Combos 3";
Expand Down
5 changes: 5 additions & 0 deletions MHFZ_Overlay/MHFZ_Overlay.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<PlatformTarget>x86</PlatformTarget>
<UseWindowsForms>True</UseWindowsForms>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ApplicationIcon>mhfzoverlayicon256.ico</ApplicationIcon>
</PropertyGroup>

<ItemGroup>
Expand All @@ -20,6 +21,10 @@
<Page Remove="icons\Settings.xaml" />
</ItemGroup>

<ItemGroup>
<Content Include="mhfzoverlayicon256.ico" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="DiscordRichPresence" Version="1.0.175" />
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.4.0" />
Expand Down
Loading