Skip to content

Commit

Permalink
Optimised Omega Blur Fix patch
Browse files Browse the repository at this point in the history 
	modified:   Sonic-06-Mod-Manager/Properties/Resources.Designer.cs
	modified:   Sonic-06-Mod-Manager/Properties/Resources.resx
	modified:   Sonic-06-Mod-Manager/Sonic '06 Mod Manager.csproj
	deleted:    Sonic-06-Mod-Manager/res/omega_Root_Fix.xno
	deleted:    Sonic-06-Mod-Manager/res/omega_Root_Retail.xno
	modified:   Sonic-06-Mod-Manager/src/ModManager.cs
  • Loading branch information
HyperPolygon64 committed Jan 16, 2020
1 parent 8398ebe commit d26f94c
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 42 deletions.
20 changes: 0 additions & 20 deletions Sonic-06-Mod-Manager/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions Sonic-06-Mod-Manager/Properties/Resources.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,6 @@
<data name="Newtonsoft_Json" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\res\Newtonsoft.Json.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="omega_Root_Fix" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\res\omega_Root_Fix.xno;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="omega_Root_Retail" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\res\omega_Root_Retail.xno;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Ookii_Dialogs" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\res\Ookii.Dialogs.dll;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
Expand Down
12 changes: 5 additions & 7 deletions Sonic-06-Mod-Manager/Sonic '06 Mod Manager.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,17 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="src\ModUpdater.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="src\ModUpdater.Designer.cs">
<DependentUpon>ModUpdater.cs</DependentUpon>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="src\AboutForm.cs">
<SubType>Form</SubType>
</Compile>
Expand Down Expand Up @@ -217,8 +217,6 @@
<Content Include="res\pkgtool.exe" />
<None Include="res\Protocol Manager.exe" />
<None Include="res\xextool.exe" />
<None Include="res\omega_Root_Fix.xno" />
<None Include="res\omega_Root_Retail.xno" />
<None Include="res\retail_render_gamemode.lub" />
<None Include="res\retail_render_main.lub" />
<None Include="res\retail_render_title.lub" />
Expand Down
Binary file removed Sonic-06-Mod-Manager/res/omega_Root_Fix.xno
View file
Binary file not shown.
Binary file removed Sonic-06-Mod-Manager/res/omega_Root_Retail.xno
View file
Binary file not shown.
28 changes: 19 additions & 9 deletions Sonic-06-Mod-Manager/src/ModManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,9 @@ private void PatchAll()

if (view_PatchesList.FindItemWithText("Omega Blur Fix").Checked) {
Status = SystemMessages.msg_PatchingCharacters;
File.WriteAllBytes(Path.Combine(unpack, "player_omega\\win32\\player\\omega\\omega_Root.xno"), Properties.Resources.omega_Root_Fix);
using (var stream = File.Open(Path.Combine(unpack, "player_omega\\win32\\player\\omega\\omega_Root.xno"), FileMode.Open, FileAccess.Write)) {
stream.Position = 0x29A3; stream.WriteByte(0x46);
}
}

ARC.RepackARC(unpack, arc);
Expand Down Expand Up @@ -1830,10 +1832,10 @@ private void ChangeThemeColours() {
if (!Properties.Settings.Default.theme) {
btn_Theme.Text = "Theme: Light";

unifytb_Main.BackTabColor = SystemColors.Control;
unifytb_Main.BorderColor = SystemColors.Control;
unifytb_Main.HeaderColor = SystemColors.ControlLightLight;
unifytb_Main.TextColor = SystemColors.ControlText;
unifytb_Patches.BackTabColor = unifytb_Main.BackTabColor = SystemColors.Control;
unifytb_Patches.BorderColor = unifytb_Main.BorderColor = SystemColors.Control;
unifytb_Patches.HeaderColor = unifytb_Main.HeaderColor = SystemColors.ControlLightLight;
unifytb_Patches.TextColor = unifytb_Main.TextColor = SystemColors.ControlText;
status_Main.BackColor = SystemColors.Control;
BackColor = SystemColors.ControlLight;

Expand Down Expand Up @@ -1869,6 +1871,8 @@ private void ChangeThemeColours() {
lbl_MSAA.ForeColor = SystemColors.GrayText;
lbl_CameraTweaks.ForeColor = SystemColors.GrayText;
lbl_ForceAA.ForeColor = SystemColors.GrayText;
lbl_CharacterTweaksOverlay.ForeColor = SystemColors.GrayText;
lbl_HammerRange.ForeColor = SystemColors.GrayText;
} else {
lbl_ManualInstall.ForeColor = SystemColors.ControlText;
if (Prerequisites.JavaCheck()) lbl_ManualPatches.ForeColor = SystemColors.ControlText;
Expand All @@ -1881,6 +1885,8 @@ private void ChangeThemeColours() {
lbl_Renderer.ForeColor = SystemColors.ControlText;
lbl_CameraHeight.ForeColor = SystemColors.ControlText;
lbl_CameraTweaks.ForeColor = SystemColors.ControlText;
lbl_CharacterTweaksOverlay.ForeColor = SystemColors.ControlText;
lbl_HammerRange.ForeColor = SystemColors.ControlText;
if (combo_Renderer.SelectedIndex == 0 && combo_MSAA.SelectedIndex == 1) {
lbl_MSAA.ForeColor = SystemColors.ControlText;
lbl_ForceAA.ForeColor = SystemColors.ControlText;
Expand Down Expand Up @@ -1956,10 +1962,10 @@ private void ChangeThemeColours() {
else {
btn_Theme.Text = "Theme: Dark";

unifytb_Main.BackTabColor = Color.FromArgb(28, 28, 28);
unifytb_Main.BorderColor = Color.FromArgb(30, 30, 30);
unifytb_Main.HeaderColor = Color.FromArgb(45, 45, 48);
unifytb_Main.TextColor = Color.FromArgb(255, 255, 255);
unifytb_Patches.BackTabColor = unifytb_Main.BackTabColor = Color.FromArgb(28, 28, 28);
unifytb_Patches.BorderColor = unifytb_Main.BorderColor = Color.FromArgb(30, 30, 30);
unifytb_Patches.HeaderColor = unifytb_Main.HeaderColor = Color.FromArgb(45, 45, 48);
unifytb_Patches.TextColor = unifytb_Main.TextColor = Color.FromArgb(255, 255, 255);
status_Main.BackColor = Color.FromArgb(28, 28, 28);
BackColor = Color.FromArgb(45, 45, 48);

Expand Down Expand Up @@ -1995,6 +2001,8 @@ private void ChangeThemeColours() {
lbl_MSAA.ForeColor = SystemColors.GrayText;
lbl_CameraTweaks.ForeColor = SystemColors.GrayText;
lbl_ForceAA.ForeColor = SystemColors.GrayText;
lbl_CharacterTweaksOverlay.ForeColor = SystemColors.GrayText;
lbl_HammerRange.ForeColor = SystemColors.GrayText;
} else {
lbl_ManualInstall.ForeColor = SystemColors.Control;
if (Prerequisites.JavaCheck()) lbl_ManualPatches.ForeColor = SystemColors.Control;
Expand All @@ -2007,6 +2015,8 @@ private void ChangeThemeColours() {
lbl_Renderer.ForeColor = SystemColors.Control;
lbl_CameraHeight.ForeColor = SystemColors.Control;
lbl_CameraTweaks.ForeColor = SystemColors.Control;
lbl_CharacterTweaksOverlay.ForeColor = SystemColors.Control;
lbl_HammerRange.ForeColor = SystemColors.Control;
if (combo_Renderer.SelectedIndex == 0 && combo_MSAA.SelectedIndex == 1) {
lbl_MSAA.ForeColor = SystemColors.Control;
lbl_ForceAA.ForeColor = SystemColors.Control;
Expand Down

0 comments on commit d26f94c

Please sign in to comment.