From e95ac6615252b9a2759b10828d518b2e88dc05fb Mon Sep 17 00:00:00 2001 From: Die4Ever Date: Tue, 16 Apr 2024 00:17:33 -0500 Subject: [PATCH] installer if choose Deus_nsf D3D10 then set it as the default renderer no matter what --- installer/GUI/InstallerWindow.py | 4 ++-- installer/Install/Install.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/installer/GUI/InstallerWindow.py b/installer/GUI/InstallerWindow.py index 99493f428..7cea16b14 100644 --- a/installer/GUI/InstallerWindow.py +++ b/installer/GUI/InstallerWindow.py @@ -234,14 +234,14 @@ def GlobalFixes(self, pad): self.globalsettings['deus_nsf_d3d10_lighting'] = BooleanVar(master=self.frame, value=False) self.deus_nsf_d3d10_lighting = Checkbutton(self.frame, text="Deus_nsf tweaked D3D10 vivid lighting", variable=self.globalsettings['deus_nsf_d3d10_lighting']) - Hovertip(self.deus_nsf_d3d10_lighting, "Tweaked D3D10 shaders for more vivid lighting.") + Hovertip(self.deus_nsf_d3d10_lighting, "Tweaked D3D10 shaders for more vivid lighting.\nMay require more powerful hardware.") self.setgrid(self.deus_nsf_d3d10_lighting, True, column=1,row=self.row, sticky='SW', padx=pad, pady=pad) self.FixColors(self.deus_nsf_d3d10_lighting) self.row+=1 self.globalsettings['deus_nsf_d3d10_retro_textures'] = BooleanVar(master=self.frame, value=False) self.deus_nsf_d3d10_retro_textures = Checkbutton(self.frame, text="Deus_nsf tweaked D3D10 retro texture filtering", variable=self.globalsettings['deus_nsf_d3d10_retro_textures']) - Hovertip(self.deus_nsf_d3d10_retro_textures, "Tweaked D3D10 shaders for retro texture filtering.") + Hovertip(self.deus_nsf_d3d10_retro_textures, "Tweaked D3D10 shaders for retro texture filtering.\nMay require more powerful hardware.") self.setgrid(self.deus_nsf_d3d10_retro_textures, True, column=1,row=self.row, sticky='SW', padx=pad, pady=pad) self.FixColors(self.deus_nsf_d3d10_retro_textures) self.row+=1 diff --git a/installer/Install/Install.py b/installer/Install/Install.py index 88e8328e9..81e9475e6 100644 --- a/installer/Install/Install.py +++ b/installer/Install/Install.py @@ -223,7 +223,10 @@ def VanillaFixConfigs(system, exename, kentie, globalsettings:dict, sourceINI: P changes['DeusEx.DXRFlags'] = {} changes['DeusEx.DXRFlags'].update({'gamemode': '4'}) - if IsWindows() and not globalsettings['dxvk']: + if globalsettings['deus_nsf_d3d10_lighting'] or globalsettings['deus_nsf_d3d10_retro_textures']: + # keep D3D10 because obviously they wanted it + changes['Engine.Engine'] = {'GameRenderDevice': 'D3D10Drv.D3D10RenderDevice'} + elif IsWindows() and not globalsettings['dxvk']: changes['Engine.Engine'] = {'GameRenderDevice': 'D3D9Drv.D3D9RenderDevice'} elif not IsWindows(): if globalsettings['ogl2']: