Added quest seperation

pv42 · Sep 28, 2018 · f4769ff · f4769ff
1 parent 1f0f6ec
commit f4769ff
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,7 @@
+################################################################################
+# Diese .gitignore-Datei wurde von Microsoft(R) Visual Studio automatisch erstellt.
+################################################################################
+
+/obj/x64
+/bin
+/.vs/mhw_damage_meter_1_5/v15
diff --git a/mainwindow.xaml b/mainwindow.xaml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Window x:Class="mhw_dps_wpf.MainWindow" Title="mhw_dps_display" Height="150" Width="309" MinWidth="200" MinHeight="70" Background="#00FFFFFF" Loaded="Window_Loaded" SizeChanged="Window_SizeChanged" MouseDown="Window_MouseDown" MouseWheel="Window_MouseWheel" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:mhw_dps_wpf">
+    <Grid>
+        <Canvas Name="front_canvas" Grid.Row="0" Grid.Column="0"/>
+        <TextBox Name="combatLog" Grid.Row="1" Grid.Column="0" VerticalAlignment="Bottom" Opacity="0.65" Background="DarkSlateGray" Foreground="White" VerticalScrollBarVisibility="Visible" IsReadOnly="True"/>
+    </Grid>
+</Window>
diff --git a/mhw_damage_meter_1_5.csproj b/mhw_damage_meter_1_5.csproj
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{72EBB578-3799-4A35-BD23-89D83EBB3B04}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
+    <OutputType>WinExe</OutputType>
+    <LangVersion>7.3</LangVersion>
+    <AssemblyName>mhw_dps_wpf</AssemblyName>
+    <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'x64' ">
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="PresentationFramework">
+      <HintPath>C:\WINDOWS\Microsoft.Net\assembly\GAC_MSIL\PresentationFramework\v4.0_4.0.0.0__31bf3856ad364e35\PresentationFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <HintPath>C:\WINDOWS\Microsoft.Net\assembly\GAC_MSIL\System\v4.0_4.0.0.0__b77a5c561934e089\System.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xaml">
+      <HintPath>C:\WINDOWS\Microsoft.Net\assembly\GAC_MSIL\System.Xaml\v4.0_4.0.0.0__b77a5c561934e089\System.Xaml.dll</HintPath>
+    </Reference>
+    <Reference Include="WindowsBase">
+      <HintPath>C:\WINDOWS\Microsoft.Net\assembly\GAC_MSIL\WindowsBase\v4.0_4.0.0.0__31bf3856ad364e35\WindowsBase.dll</HintPath>
+    </Reference>
+    <Reference Include="PresentationCore">
+      <HintPath>C:\WINDOWS\Microsoft.Net\assembly\GAC_64\PresentationCore\v4.0_4.0.0.0__31bf3856ad364e35\PresentationCore.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Core">
+      <HintPath>C:\WINDOWS\Microsoft.Net\assembly\GAC_MSIL\System.Core\v4.0_4.0.0.0__b77a5c561934e089\System.Core.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="memory.cs" />
+    <Compile Include="mhw.cs" />
+    <Compile Include="mhw_dps_wpf.Properties\Resources.cs" />
+    <Compile Include="mhw_dps_wpf.Properties\Settings.cs" />
+    <Compile Include="mhw_dps_wpf\App.cs" />
+    <Compile Include="mhw_dps_wpf\PlayerList.cs" />
+    <Compile Include="mhw_dps_wpf\Player.cs" />
+    <Compile Include="mhw_dps_wpf\MainWindow.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="C:\Users\pv42\Saved Games\MHDPS\own_1.5\mainwindow.xaml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/mhw_damage_meter_1_5.sln b/mhw_damage_meter_1_5.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2019
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mhw_damage_meter_1_5", "mhw_damage_meter_1_5.csproj", "{72EBB578-3799-4A35-BD23-89D83EBB3B04}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{72EBB578-3799-4A35-BD23-89D83EBB3B04}.Debug|x64.ActiveCfg = Debug|x64
+		{72EBB578-3799-4A35-BD23-89D83EBB3B04}.Debug|x64.Build.0 = Debug|x64
+		{72EBB578-3799-4A35-BD23-89D83EBB3B04}.Release|x64.ActiveCfg = Release|x64
+		{72EBB578-3799-4A35-BD23-89D83EBB3B04}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {36B007A8-19BA-4884-B202-A30C37B35B55}
+	EndGlobalSection
+EndGlobal
diff --git a/mhw_dps_wpf/Player.cs b/mhw_dps_wpf/Player.cs
@@ -18,6 +18,8 @@ public int damage {
                 if (_damage > value) { // i am almost sure it should be the other way around but whatever
                     hitlist.Clear();  // reset
                     Console.WriteLine("Reseted hit history");
+                    _window.log("reseted player " + name);
+
                 } else {
                     if (_damage != value && initialized && !name.Equals("")) {
                         _window.log(name + " hit for " + (value - _damage));