snxrzx
/
mkxp-sunshine
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git conflict solve meow

This commit is contained in:
niko(depressedTWM) 2026-07-18 10:56:10 -04:00
parent 8515078470 b5edbb293d
commit fc0586de57
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/0.1.1.txt
View File

@ -75,3 +75,4 @@ Barrens reworked
Solstice credits fixed Solstice credits fixed
Deleted unused maps Deleted unused maps
cafe map size fixed cafe map size fixed
Big performance fix

2
scripts/Data_Settings_Classes.rb
View File

@ -318,7 +318,7 @@ class Window_Settings
end end
def value def value
if (Settings.has?(@parameter)) if @parameter && Settings.has?(@parameter)
@value = Settings[@parameter] @value = Settings[@parameter]
end end
@value @value

2
scripts/Window_Settings.rb
View File

@ -91,7 +91,7 @@ class Window_Settings
parameter_info[:name], parameter_info[:parameter], parameter_info[:default], parameter_info[:step], parameter_info[:min], parameter_info[:max])) parameter_info[:name], parameter_info[:parameter], parameter_info[:default], parameter_info[:step], parameter_info[:min], parameter_info[:max]))
when :enum when :enum
@content.add_parameter(screen_title, EnumParameter.new(@content, screen_index, parameter_index, @content.add_parameter(screen_title, EnumParameter.new(@content, screen_index, parameter_index,
parameter_info[:name], parameter_info[:parameter], 0, parameter_info[:values])) parameter_info[:name], parameter_info[:parameter], parameter_info[:default], parameter_info[:values]))
when :sep when :sep
@content.add_parameter(screen_title, Separator.new(@content, screen_index, parameter_index, @content.add_parameter(screen_title, Separator.new(@content, screen_index, parameter_index,
parameter_info[:name])) parameter_info[:name]))