Skip to content

Commit

Permalink
"about"-window overhaul
Browse files Browse the repository at this point in the history 
added special thanks
added function to read the game patch
small ui changes
fixed gender-selection text
  • Loading branch information
@tolik518
tolik518 committed Oct 23, 2023
1 parent 9dad9a2 commit 8682ecc
Show file tree
Hide file tree
Showing 20 changed files with 955 additions and 899 deletions.
2 changes: 1 addition & 1 deletion SoG_SGreader.Test/IntegrationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public void TestPatchOutput()
string output = process.StandardOutput.ReadToEnd();
process.WaitForExit();

Assert.Contains(FrmMain.CurrentPatch, output);
Assert.Contains(FrmMain.SupportedPatch, output);
}
}
}
207 changes: 112 additions & 95 deletions SoG_SGreader.Test/SoG_SGreader.Test.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,103 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{1D81F599-E306-4A55-9A88-EEE9F3636546}</ProjectGuid>
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SoG_SGreader.Test</RootNamespace>
<AssemblyName>SoG_SGreader.Test</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<LangVersion>8</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.17.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\packages\Moq.4.17.2\lib\net45\Moq.dll</HintPath>
</Reference>
<Reference Include="System"/>
<Reference Include="System.Configuration" />
<Reference Include="System.Core"/>
<Reference Include="System.Data"/>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml"/>
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
</Reference>
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
</Reference>
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="DataReaderTests.cs" />
<Compile Include="IntegrationTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SoG_SGreader\SoG_SGreader.csproj">
<Project>{da45322a-6a3c-4652-b5f4-d2dc917fc93a}</Project>
<Name>SoG_SGreader</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="SaveGames\0.cha" />
<Content Include="SaveGames\1.cha" />
<Content Include="SaveGames\2.cha" />
<Content Include="SaveGames\3.cha" />
<Content Include="SaveGames\4.cha" />
<Content Include="SaveGames\5.cha" />
<Content Include="SaveGames\6.cha" />
<Content Include="SaveGames\7.cha" />
<Content Include="SaveGames\8.cha" />
<Content Include="SaveGames\8.wld" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{1D81F599-E306-4A55-9A88-EEE9F3636546}</ProjectGuid>
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SoG_SGreader.Test</RootNamespace>
<AssemblyName>SoG_SGreader.Test</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<LangVersion>8</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>8</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>8</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="Moq, Version=4.17.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\packages\Moq.4.17.2\lib\net45\Moq.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
</Reference>
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
</Reference>
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c">
<HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="DataReaderTests.cs" />
<Compile Include="IntegrationTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SoG_SGreader\SoG_SGreader.csproj">
<Project>{da45322a-6a3c-4652-b5f4-d2dc917fc93a}</Project>
<Name>SoG_SGreader</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="SaveGames\0.cha" />
<Content Include="SaveGames\1.cha" />
<Content Include="SaveGames\2.cha" />
<Content Include="SaveGames\3.cha" />
<Content Include="SaveGames\4.cha" />
<Content Include="SaveGames\5.cha" />
<Content Include="SaveGames\6.cha" />
<Content Include="SaveGames\7.cha" />
<Content Include="SaveGames\8.cha" />
<Content Include="SaveGames\8.wld" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
12 changes: 11 additions & 1 deletion SoG_SGreader.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,34 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30711.63
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sog_SGreader", "SoG_SGreader\SoG_SGreader.csproj", "{DA45322A-6A3C-4652-B5F4-D2DC917FC93A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoG_SGreader", "SoG_SGreader\SoG_SGreader.csproj", "{DA45322A-6A3C-4652-B5F4-D2DC917FC93A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoG_SGreader.Test", "SoG_SGreader.Test\SoG_SGreader.Test.csproj", "{1D81F599-E306-4A55-9A88-EEE9F3636546}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Debug|x86.ActiveCfg = Debug|x86
{DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Debug|x86.Build.0 = Debug|x86
{DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Release|Any CPU.Build.0 = Release|Any CPU
{DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Release|x86.ActiveCfg = Release|x86
{DA45322A-6A3C-4652-B5F4-D2DC917FC93A}.Release|x86.Build.0 = Release|x86
{1D81F599-E306-4A55-9A88-EEE9F3636546}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D81F599-E306-4A55-9A88-EEE9F3636546}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D81F599-E306-4A55-9A88-EEE9F3636546}.Debug|x86.ActiveCfg = Debug|x86
{1D81F599-E306-4A55-9A88-EEE9F3636546}.Debug|x86.Build.0 = Debug|x86
{1D81F599-E306-4A55-9A88-EEE9F3636546}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1D81F599-E306-4A55-9A88-EEE9F3636546}.Release|Any CPU.Build.0 = Release|Any CPU
{1D81F599-E306-4A55-9A88-EEE9F3636546}.Release|x86.ActiveCfg = Release|x86
{1D81F599-E306-4A55-9A88-EEE9F3636546}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
1 change: 0 additions & 1 deletion SoG_SGreader/DataReader.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Windows.Forms;

namespace SoG_SGreader
{
Expand Down
Loading

0 comments on commit 8682ecc

Please sign in to comment.