From 2ea506b296b0f5d1625304cf67086bd8baf59310 Mon Sep 17 00:00:00 2001
From: Issac332 <119879937+Issac8658@users.noreply.github.com>
Date: Sun, 19 Jul 2026 15:50:51 +0300
Subject: [PATCH] "Video" screen reorder in settings

---
 scripts/Data_Settings.rb         | 33 ++++++++++++++++----------------
 scripts/Data_Settings_Classes.rb | 20 +++++++++++--------
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/scripts/Data_Settings.rb b/scripts/Data_Settings.rb
index 71bbafa..d1cb031 100644
--- a/scripts/Data_Settings.rb
+++ b/scripts/Data_Settings.rb
@@ -135,6 +135,7 @@ class Window_Settings
       },
     ],
     tr("Video") => [
+      { :type => :sep, :name => tr("Screen")},
       {
         :type => :enum,
         :name => tr('Resolution'),
@@ -147,33 +148,33 @@ class Window_Settings
         :name => tr('Fullscreen'),
         :parameter => :fullscreen
       },
-      {
-        :type => :bool,
-        :name => tr('Colorblind mode'),
-        :parameter => :colorblind
-      },
       {
         :type => :bool,
         :name => tr('Frameskip'),
         :parameter => :frameskip
       },
-      {
-        :type => :bool,
-        :name => tr('World machine shader'),
-        :parameter => :twm_shader
-      },
-      { :type => :sep, :name => tr("Lighting")},
-      {
-        :type => :bool,
-        :name => tr('Dynamic Light'),
-        :parameter => :light,
-      },
       {
         :type => :enum,
         :name => tr('Scaling mode'),
         :parameter => :scaling_mode,
         :values => [tr("Nearest Neighbor"), tr("Smooth(old)")]
       },
+      { :type => :sep, :name => tr("World")},
+      {
+        :type => :bool,
+        :name => tr('Dynamic Light'),
+        :parameter => :light,
+      },
+      {
+        :type => :bool,
+        :name => tr('World machine shader'),
+        :parameter => :twm_shader
+      },
+      {
+        :type => :bool,
+        :name => tr('Colorblind mode'),
+        :parameter => :colorblind
+      },
     ],
     tr("UI") => [
       {
diff --git a/scripts/Data_Settings_Classes.rb b/scripts/Data_Settings_Classes.rb
index 4b35d1b..e67cc3b 100644
--- a/scripts/Data_Settings_Classes.rb
+++ b/scripts/Data_Settings_Classes.rb
@@ -195,6 +195,9 @@ class Window_Settings
       @switch_panels_hint_left.x -= SCREENS_PANELS_MARGIN
       @parameters.values[@screen]&.[](@index)&.select(previous)
       update_pos
+      if @parameters.values[@screen]&.[](@index)&.class&.const_get(:TYPE) == :sep
+        parameter_down
+      end
     end
     def screen_right()
       previous = @index
@@ -204,27 +207,28 @@ class Window_Settings
       @switch_panels_hint_right.x += SCREENS_PANELS_MARGIN
       @parameters.values[@screen]&.[](@index)&.select(previous)
       update_pos
+      if @parameters.values[@screen]&.[](@index)&.class&.const_get(:TYPE) == :sep
+        parameter_down
+      end
     end
 
     def parameter_up()
       previous = @index
       @parameters.values[@screen]&.[](@index)&.deselect
-      offset = 1
-      if @parameters.values&.[](@screen)&.[](@index - 1)&.class&.const_get(:TYPE) == :sep
-        offset += 1
+      @index = (@index - 1) % @parameters.values[@screen].length
+      if @parameters.values&.[](@screen)&.[](@index)&.class&.const_get(:TYPE) == :sep
+        @index = (@index - 1) % @parameters.values[@screen].length
       end
-      @index = (@index - offset) % @parameters.values[@screen].length
       @parameters.values[@screen]&.[](@index)&.select(previous)
       update_pos
     end
     def parameter_down()
       previous = @index
       @parameters.values[@screen]&.[](@index)&.deselect
-      offset = 1
-      if @parameters.values&.[](@screen)&.[](@index + 1)&.class&.const_get(:TYPE) == :sep
-        offset += 1
+      @index = (@index + 1) % @parameters.values[@screen].length
+      if @parameters.values&.[](@screen)&.[](@index)&.class&.const_get(:TYPE) == :sep
+        @index = (@index + 1) % @parameters.values[@screen].length
       end
-      @index = (@index + offset) % @parameters.values[@screen].length
       @parameters.values[@screen]&.[](@index)&.select(previous)
       update_pos
     end