mirror of
https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
synced 2026-08-22 23:06:18 +00:00
some fixes
This commit is contained in:
parent
974d2d8874
commit
5cf1d14525
3 changed files with 9 additions and 17 deletions
|
|
@ -138,11 +138,6 @@ class Window_Settings
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
tr("Video") => [
|
tr("Video") => [
|
||||||
{
|
|
||||||
:type => :bool,
|
|
||||||
:name => tr('Fullscreen'),
|
|
||||||
:parameter => :fullscreen
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
:type => :enum,
|
:type => :enum,
|
||||||
:name => tr('Resolution'),
|
:name => tr('Resolution'),
|
||||||
|
|
@ -150,6 +145,11 @@ class Window_Settings
|
||||||
:parameter => Graphics::RESOLUTION_OVERRIDDEN ? nil : :resolution,
|
:parameter => Graphics::RESOLUTION_OVERRIDDEN ? nil : :resolution,
|
||||||
:values => Graphics::RESOLUTION_OVERRIDDEN ? ["Resolution is redefined via config"] : Graphics.resolutions_names_list
|
:values => Graphics::RESOLUTION_OVERRIDDEN ? ["Resolution is redefined via config"] : Graphics.resolutions_names_list
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
:type => :bool,
|
||||||
|
:name => tr('Fullscreen'),
|
||||||
|
:parameter => :fullscreen
|
||||||
|
},
|
||||||
{
|
{
|
||||||
:type => :bool,
|
:type => :bool,
|
||||||
:name => tr('Colorblind mode'),
|
:name => tr('Colorblind mode'),
|
||||||
|
|
@ -193,7 +193,7 @@ class Window_Settings
|
||||||
:type => :enum,
|
:type => :enum,
|
||||||
:name => tr('FastTravel UI'),
|
:name => tr('FastTravel UI'),
|
||||||
:parameter => :fasttravel_ui,
|
:parameter => :fasttravel_ui,
|
||||||
:values => [tr("Original"), tr("WME")]
|
:values => [tr("Original"), tr("WME (WIP)")]
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
tr("Gameplay") => [
|
tr("Gameplay") => [
|
||||||
|
|
|
||||||
|
|
@ -283,11 +283,7 @@ class Game_Map
|
||||||
def scroll_down(distance)
|
def scroll_down(distance)
|
||||||
return if @display_y_fix
|
return if @display_y_fix
|
||||||
|
|
||||||
if self.height < Graphics.height / 28
|
@display_y = [@display_y + distance, (self.height - Graphics.height / 32 - 1) * 128].min
|
||||||
@display_y = self.height / 2
|
|
||||||
else
|
|
||||||
@display_y = [@display_y + distance, (self.height - Graphics.height / 28) * 128].min
|
|
||||||
end
|
|
||||||
@display_y = @display_y.clamp((@display_clip_top * 128.0).to_i, (@display_clip_bottom * 128.0).to_i - Graphics.height * 4)
|
@display_y = @display_y.clamp((@display_clip_top * 128.0).to_i, (@display_clip_bottom * 128.0).to_i - Graphics.height * 4)
|
||||||
end
|
end
|
||||||
#--------------------------------------------------------------------------
|
#--------------------------------------------------------------------------
|
||||||
|
|
@ -317,11 +313,7 @@ class Game_Map
|
||||||
def scroll_up(distance)
|
def scroll_up(distance)
|
||||||
return if @display_y_fix
|
return if @display_y_fix
|
||||||
|
|
||||||
if self.height < Graphics.height / 28
|
@display_y = [@display_y - distance, 0].max
|
||||||
@display_y = self.height / 2
|
|
||||||
else
|
|
||||||
@display_y = [@display_y - distance, 0].max
|
|
||||||
end
|
|
||||||
@display_y = @display_y.clamp((@display_clip_top * 128.0).to_i, (@display_clip_bottom * 128.0).to_i - Graphics.height * 4)
|
@display_y = @display_y.clamp((@display_clip_top * 128.0).to_i, (@display_clip_bottom * 128.0).to_i - Graphics.height * 4)
|
||||||
end
|
end
|
||||||
#--------------------------------------------------------------------------
|
#--------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -203,7 +203,7 @@ class Spriteset_Map
|
||||||
else
|
else
|
||||||
if @panorama_name == "dark_water"
|
if @panorama_name == "dark_water"
|
||||||
@panorama.shader = Shader::Water
|
@panorama.shader = Shader::Water
|
||||||
@panorama.color.set(0, 0, 127, 0)
|
@panorama.color.set(0, 0, 255, 0)
|
||||||
@panorama.tone.set(0, 0, 255, 63)
|
@panorama.tone.set(0, 0, 255, 63)
|
||||||
@panorama.blend_type = 1
|
@panorama.blend_type = 1
|
||||||
elsif @panorama_name == "green_water"
|
elsif @panorama_name == "green_water"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue