Skip to content

Commit 214bdbe

Browse files
FenPhoenixFenPhoenix
committed
Merge branch 'm_TopRightLazy_V2'
2 parents fdb6364 + 4dd3543 commit 214bdbe

File tree

78 files changed

+8898
-3327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+8898
-3327
lines changed

‎AngelLoader/AngelLoader.csproj

+159-159
Original file line numberDiff line numberDiff line change
@@ -1,166 +1,166 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

3-
<PropertyGroup>
4-
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net472</TargetFramework>
6-
<UseWindowsForms>true</UseWindowsForms>
7-
<Platforms>x86;x64</Platforms>
8-
<LangVersion>latest</LangVersion>
9-
<Configurations>Debug;Release;Release_Beta;Release_Public;Release_Testing;RT_StartupOnly;Release_Testing_NoAsserts</Configurations>
10-
<StartupObject>AngelLoader.Program</StartupObject>
11-
<ApplicationIcon>Resources\AngelLoader.ico</ApplicationIcon>
12-
<ApplicationManifest>app.manifest</ApplicationManifest>
13-
14-
<Nullable>enable</Nullable>
15-
16-
<AssemblyTitle>AngelLoader</AssemblyTitle>
17-
<Product>AngelLoader</Product>
18-
<NeutralLanguage>en-US</NeutralLanguage>
19-
<Description>A standalone fan mission loader and manager for Thief Gold, Thief II, Thief: Deadly Shadows, and System Shock 2.</Description>
20-
<Copyright>Copyright © 2018 - 2022</Copyright>
21-
<Version>1.6.8</Version>
22-
<AssemblyVersion>1.6.8</AssemblyVersion>
23-
<FileVersion>1.6.8</FileVersion>
24-
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
25-
</PropertyGroup>
26-
27-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
28-
<DefineConstants>DEBUG;TRACE;Debug</DefineConstants>
29-
<OutputPath>bin\x86\Debug\</OutputPath>
30-
</PropertyGroup>
31-
32-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
33-
<DefineConstants>DEBUG;TRACE;Debug</DefineConstants>
34-
<OutputPath>bin\x64\Debug\</OutputPath>
35-
</PropertyGroup>
36-
37-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
38-
<Optimize>true</Optimize>
39-
<DefineConstants>TRACE;Release</DefineConstants>
40-
<OutputPath>bin\x86\Release\</OutputPath>
41-
</PropertyGroup>
42-
43-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
44-
<Optimize>true</Optimize>
45-
<DefineConstants>TRACE;Release</DefineConstants>
46-
<OutputPath>bin\x64\Release\</OutputPath>
47-
</PropertyGroup>
48-
49-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Testing|x86'">
50-
<Optimize>true</Optimize>
51-
<DefineConstants>TRACE;Release,Release_Testing</DefineConstants>
52-
<OutputPath>bin\x86\Release\</OutputPath>
53-
</PropertyGroup>
54-
55-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Testing|x64'">
56-
<Optimize>true</Optimize>
57-
<DefineConstants>TRACE;Release,Release_Testing</DefineConstants>
58-
<OutputPath>bin\x64\Release\</OutputPath>
59-
</PropertyGroup>
60-
61-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Testing_NoAsserts|x86'">
62-
<Optimize>true</Optimize>
63-
<DefineConstants>TRACE;Release,Release_Testing,NoAsserts</DefineConstants>
64-
<OutputPath>bin\x86\Release\</OutputPath>
65-
</PropertyGroup>
66-
67-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Testing_NoAsserts|x64'">
68-
<Optimize>true</Optimize>
69-
<DefineConstants>TRACE;Release,Release_Testing,NoAsserts</DefineConstants>
70-
<OutputPath>bin\x64\Release\</OutputPath>
71-
</PropertyGroup>
72-
73-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Beta|x86'">
74-
<Optimize>true</Optimize>
75-
<OutputPath>bin\x86\Release_Beta\</OutputPath>
76-
<DefineConstants>TRACE;Release, ReleaseBeta</DefineConstants>
77-
</PropertyGroup>
78-
79-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Beta|x64'">
80-
<Optimize>true</Optimize>
81-
<OutputPath>bin\x64\Release_Beta\</OutputPath>
82-
<DefineConstants>TRACE;Release, ReleaseBeta</DefineConstants>
83-
</PropertyGroup>
84-
85-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Public|x86'">
86-
<Optimize>true</Optimize>
87-
<DefineConstants>TRACE;Release, ReleasePublic</DefineConstants>
88-
<OutputPath>bin\x86\Release_Public\</OutputPath>
89-
</PropertyGroup>
90-
91-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Public|x64'">
92-
<Optimize>true</Optimize>
93-
<DefineConstants>TRACE;Release, ReleasePublic</DefineConstants>
94-
<OutputPath>bin\x64\Release_Public\</OutputPath>
95-
</PropertyGroup>
96-
97-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RT_StartupOnly|x86'">
98-
<Optimize>true</Optimize>
99-
<DefineConstants>TRACE;Release,Release_Testing,RT_StartupOnly</DefineConstants>
100-
<OutputPath>bin\x86\Release\</OutputPath>
101-
</PropertyGroup>
102-
103-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RT_StartupOnly|x64'">
104-
<Optimize>true</Optimize>
105-
<DefineConstants>TRACE;Release,Release_Testing,RT_StartupOnly</DefineConstants>
106-
<OutputPath>bin\x64\Release\</OutputPath>
107-
</PropertyGroup>
108-
109-
<ItemGroup>
110-
<PackageReference Include="7z.Libs" Version="19.0.2" />
111-
<PackageReference Include="EasyHook" Version="2.7.7097" />
112-
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
113-
<PackageReference Include="Nullable" Version="1.3.1">
114-
<PrivateAssets>all</PrivateAssets>
115-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
116-
</PackageReference>
117-
<PackageReference Include="Squid-Box.SevenZipSharp" Version="1.3.318" />
118-
</ItemGroup>
119-
120-
<ItemGroup>
121-
<ProjectReference Include="..\AL_Common\AL_Common.csproj" />
122-
<ProjectReference Include="..\FMScanner\FMScanner.csproj" />
123-
</ItemGroup>
124-
125-
<ItemGroup>
126-
<Reference Include="Microsoft.VisualBasic" />
127-
<Reference Include="System.Configuration" />
128-
<Reference Include="System.IO.Compression" />
129-
</ItemGroup>
130-
131-
<ItemGroup>
132-
<Compile Update="Forms\CustomControls\DarkButton.cs" />
133-
<Compile Update="Forms\CustomControls\DarkCheckBox.cs" />
134-
<Compile Update="Forms\CustomControls\DarkComboBox.cs" />
135-
<Compile Update="Forms\CustomControls\DarkContextMenu.cs" />
136-
<Compile Update="Forms\CustomControls\DarkGroupBox.cs" />
137-
<Compile Update="Forms\CustomControls\DarkNumericUpDown.cs" />
138-
<Compile Update="Forms\CustomControls\DarkRadioButton.cs" />
139-
<Compile Update="Forms\CustomControls\DarkTabControl.cs" />
140-
<Compile Update="Forms\CustomControls\DarkTextBox.cs" />
141-
<Compile Update="Properties\Resources.Designer.cs">
142-
<DesignTime>True</DesignTime>
143-
<AutoGen>True</AutoGen>
144-
<DependentUpon>Resources.resx</DependentUpon>
145-
</Compile>
146-
</ItemGroup>
147-
148-
<ItemGroup>
149-
<EmbeddedResource Update="Properties\Resources.resx">
150-
<Generator>ResXFileCodeGenerator</Generator>
151-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
152-
</EmbeddedResource>
153-
</ItemGroup>
154-
155-
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
156-
<Exec Command="pre_build.bat &quot;$(Configuration)&quot; &quot;$(TargetDir)&quot; &quot;$(ProjectDir)&quot; &quot;$(SolutionDir)&quot; &quot;$(PlatformName)&quot;" WorkingDirectory="$(ProjectDir)" />
157-
</Target>
158-
<!--
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework>net472</TargetFramework>
6+
<UseWindowsForms>true</UseWindowsForms>
7+
<Platforms>x86;x64</Platforms>
8+
<LangVersion>latest</LangVersion>
9+
<Configurations>Debug;Release;Release_Beta;Release_Public;Release_Testing;RT_StartupOnly;Release_Testing_NoAsserts</Configurations>
10+
<StartupObject>AngelLoader.Program</StartupObject>
11+
<ApplicationIcon>Resources\AngelLoader.ico</ApplicationIcon>
12+
<ApplicationManifest>app.manifest</ApplicationManifest>
13+
14+
<Nullable>enable</Nullable>
15+
16+
<AssemblyTitle>AngelLoader</AssemblyTitle>
17+
<Product>AngelLoader</Product>
18+
<NeutralLanguage>en-US</NeutralLanguage>
19+
<Description>A standalone fan mission loader and manager for Thief Gold, Thief II, Thief: Deadly Shadows, and System Shock 2.</Description>
20+
<Copyright>Copyright © 2018 - 2022</Copyright>
21+
<Version>1.6.9</Version>
22+
<AssemblyVersion>1.6.9</AssemblyVersion>
23+
<FileVersion>1.6.9</FileVersion>
24+
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
25+
</PropertyGroup>
26+
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
28+
<DefineConstants>DEBUG;TRACE;Debug</DefineConstants>
29+
<OutputPath>bin\x86\Debug\</OutputPath>
30+
</PropertyGroup>
31+
32+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
33+
<DefineConstants>DEBUG;TRACE;Debug</DefineConstants>
34+
<OutputPath>bin\x64\Debug\</OutputPath>
35+
</PropertyGroup>
36+
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
38+
<Optimize>true</Optimize>
39+
<DefineConstants>TRACE;Release</DefineConstants>
40+
<OutputPath>bin\x86\Release\</OutputPath>
41+
</PropertyGroup>
42+
43+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
44+
<Optimize>true</Optimize>
45+
<DefineConstants>TRACE;Release</DefineConstants>
46+
<OutputPath>bin\x64\Release\</OutputPath>
47+
</PropertyGroup>
48+
49+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Testing|x86'">
50+
<Optimize>true</Optimize>
51+
<DefineConstants>TRACE;Release,Release_Testing</DefineConstants>
52+
<OutputPath>bin\x86\Release\</OutputPath>
53+
</PropertyGroup>
54+
55+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Testing|x64'">
56+
<Optimize>true</Optimize>
57+
<DefineConstants>TRACE;Release,Release_Testing</DefineConstants>
58+
<OutputPath>bin\x64\Release\</OutputPath>
59+
</PropertyGroup>
60+
61+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Testing_NoAsserts|x86'">
62+
<Optimize>true</Optimize>
63+
<DefineConstants>TRACE;Release,Release_Testing,NoAsserts</DefineConstants>
64+
<OutputPath>bin\x86\Release\</OutputPath>
65+
</PropertyGroup>
66+
67+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Testing_NoAsserts|x64'">
68+
<Optimize>true</Optimize>
69+
<DefineConstants>TRACE;Release,Release_Testing,NoAsserts</DefineConstants>
70+
<OutputPath>bin\x64\Release\</OutputPath>
71+
</PropertyGroup>
72+
73+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Beta|x86'">
74+
<Optimize>true</Optimize>
75+
<OutputPath>bin\x86\Release_Beta\</OutputPath>
76+
<DefineConstants>TRACE;Release, ReleaseBeta</DefineConstants>
77+
</PropertyGroup>
78+
79+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Beta|x64'">
80+
<Optimize>true</Optimize>
81+
<OutputPath>bin\x64\Release_Beta\</OutputPath>
82+
<DefineConstants>TRACE;Release, ReleaseBeta</DefineConstants>
83+
</PropertyGroup>
84+
85+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Public|x86'">
86+
<Optimize>true</Optimize>
87+
<DefineConstants>TRACE;Release, ReleasePublic</DefineConstants>
88+
<OutputPath>bin\x86\Release_Public\</OutputPath>
89+
</PropertyGroup>
90+
91+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Public|x64'">
92+
<Optimize>true</Optimize>
93+
<DefineConstants>TRACE;Release, ReleasePublic</DefineConstants>
94+
<OutputPath>bin\x64\Release_Public\</OutputPath>
95+
</PropertyGroup>
96+
97+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RT_StartupOnly|x86'">
98+
<Optimize>true</Optimize>
99+
<DefineConstants>TRACE;Release,Release_Testing,RT_StartupOnly</DefineConstants>
100+
<OutputPath>bin\x86\Release\</OutputPath>
101+
</PropertyGroup>
102+
103+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RT_StartupOnly|x64'">
104+
<Optimize>true</Optimize>
105+
<DefineConstants>TRACE;Release,Release_Testing,RT_StartupOnly</DefineConstants>
106+
<OutputPath>bin\x64\Release\</OutputPath>
107+
</PropertyGroup>
108+
109+
<ItemGroup>
110+
<PackageReference Include="7z.Libs" Version="19.0.2" />
111+
<PackageReference Include="EasyHook" Version="2.7.7097" />
112+
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
113+
<PackageReference Include="Nullable" Version="1.3.1">
114+
<PrivateAssets>all</PrivateAssets>
115+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
116+
</PackageReference>
117+
<PackageReference Include="Squid-Box.SevenZipSharp" Version="1.3.318" />
118+
</ItemGroup>
119+
120+
<ItemGroup>
121+
<ProjectReference Include="..\AL_Common\AL_Common.csproj" />
122+
<ProjectReference Include="..\FMScanner\FMScanner.csproj" />
123+
</ItemGroup>
124+
125+
<ItemGroup>
126+
<Reference Include="Microsoft.VisualBasic" />
127+
<Reference Include="System.Configuration" />
128+
<Reference Include="System.IO.Compression" />
129+
</ItemGroup>
130+
131+
<ItemGroup>
132+
<Compile Update="Forms\CustomControls\DarkButton.cs" />
133+
<Compile Update="Forms\CustomControls\DarkCheckBox.cs" />
134+
<Compile Update="Forms\CustomControls\DarkComboBox.cs" />
135+
<Compile Update="Forms\CustomControls\DarkContextMenu.cs" />
136+
<Compile Update="Forms\CustomControls\DarkGroupBox.cs" />
137+
<Compile Update="Forms\CustomControls\DarkNumericUpDown.cs" />
138+
<Compile Update="Forms\CustomControls\DarkRadioButton.cs" />
139+
<Compile Update="Forms\CustomControls\DarkTabControl.cs" />
140+
<Compile Update="Forms\CustomControls\DarkTextBox.cs" />
141+
<Compile Update="Properties\Resources.Designer.cs">
142+
<DesignTime>True</DesignTime>
143+
<AutoGen>True</AutoGen>
144+
<DependentUpon>Resources.resx</DependentUpon>
145+
</Compile>
146+
</ItemGroup>
147+
148+
<ItemGroup>
149+
<EmbeddedResource Update="Properties\Resources.resx">
150+
<Generator>ResXFileCodeGenerator</Generator>
151+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
152+
</EmbeddedResource>
153+
</ItemGroup>
154+
155+
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
156+
<Exec Command="pre_build.bat &quot;$(Configuration)&quot; &quot;$(TargetDir)&quot; &quot;$(ProjectDir)&quot; &quot;$(SolutionDir)&quot; &quot;$(PlatformName)&quot;" WorkingDirectory="$(ProjectDir)" />
157+
</Target>
158+
<!--
159159
"NG7zLibs_net_AfterBuild" is a 7z.libs target. We have to run after it if we want the 7z.dll file to exist so
160160
we can copy it. Blah. Also, it underlines the string like it doesn't exist, but it does find it. Tested.
161161
-->
162-
<Target Name="PostBuild" AfterTargets="PostBuildEvent" DependsOnTargets="NG7zLibs_net_AfterBuild">
163-
<Exec Command="post_build.bat &quot;$(Configuration)&quot; &quot;$(TargetDir)&quot; &quot;$(ProjectDir)&quot; &quot;$(SolutionDir)&quot; &quot;$(PlatformName)&quot;" WorkingDirectory="$(ProjectDir)" />
164-
</Target>
162+
<Target Name="PostBuild" AfterTargets="PostBuildEvent" DependsOnTargets="NG7zLibs_net_AfterBuild">
163+
<Exec Command="post_build.bat &quot;$(Configuration)&quot; &quot;$(TargetDir)&quot; &quot;$(ProjectDir)&quot; &quot;$(SolutionDir)&quot; &quot;$(PlatformName)&quot;" WorkingDirectory="$(ProjectDir)" />
164+
</Target>
165165

166166
</Project>

‎AngelLoader/AngelLoader.csproj.DotSettings

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=customcontrols_005Crichtextboxcustom/@EntryIndexedValue">True</s:Boolean>
88
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=forms_005Ccustomcontrols_005Cdatagridviewcustom/@EntryIndexedValue">True</s:Boolean>
99
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=forms_005Ccustomcontrols_005Crichtextboxcustom/@EntryIndexedValue">True</s:Boolean>
10+
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=forms_005Ccustomcontrols_005Ctoprightpages/@EntryIndexedValue">True</s:Boolean>
1011
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=forms_005Cimport/@EntryIndexedValue">True</s:Boolean>
1112
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=forms_005Csettings/@EntryIndexedValue">True</s:Boolean>
1213
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ini/@EntryIndexedValue">True</s:Boolean>

‎AngelLoader/Common/DataClasses/DarkColors.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public static class DarkColors
103103
public static readonly Pen LighterBorderPen = new Pen(LighterBorder);
104104
//public static readonly Pen DarkBorderPen = new Pen(DarkBorder);
105105
public static readonly Pen LightTextPen = new Pen(LightText);
106-
public static readonly Pen DisabledTextPen = new Pen(DisabledText);
106+
//public static readonly Pen DisabledTextPen = new Pen(DisabledText);
107107
public static readonly Pen BlueHighlightPen = new Pen(BlueHighlight);
108108
//public static readonly Pen BlueSelectionPen = new Pen(BlueSelection);
109109
public static readonly Pen GreyHighlightPen = new Pen(GreyHighlight);

‎AngelLoader/Common/DataClasses/FMData.cs

-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ internal string DisabledMods
120120
/// <summary>
121121
/// This is for backward compatibility only. Use only for that purpose.
122122
/// </summary>
123-
[FenGenDoNotWrite]
124123
internal bool DisableAllMods
125124
{
126125
get => Game != Game.Thief3 && _disableAllMods;

‎AngelLoader/Common/Errors.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ internal enum Error
1212
CamModIniNotFound,
1313
CamModIniCouldNotBeRead,
1414
SneakyOptionsNoRegKey,
15-
SneakyOptionsNotFound,
1615
T3FMInstPathNotFound,
1716
*/
17+
GeneralSneakyOptionsIniError,
18+
SneakyOptionsNotFound,
1819
GameExeNotSpecified,
1920
GameExeNotFound,
2021
SneakyDllNotFound,

‎AngelLoader/Common/Utility/MiscUtils.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,8 @@ internal static bool FMIsReallyInstalled(FanMission fm, out string fmInstalledPa
9898
}
9999

100100
string instPath = Config.GetFMInstallPath(gameIndex);
101-
if (instPath.IsEmpty()) return false;
102-
103-
return TryCombineDirectoryPathAndCheckExistence(instPath, fm.InstalledDir, out fmInstalledPath);
101+
return !instPath.IsEmpty() &&
102+
TryCombineDirectoryPathAndCheckExistence(instPath, fm.InstalledDir, out fmInstalledPath);
104103
}
105104

106105
#endregion

0 commit comments

Comments
 (0)