rebirth fix gameplay positioning inconsistency across aspect ratios

etternagame · Dec 10, 2021 · cf85b43 · cf85b43
1 parent 2dc4565
commit cf85b43
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 1 deletion.
diff --git a/Themes/Rebirth/BGAnimations/ScreenGameplay overlay/elements/_gameplaycustomization.lua b/Themes/Rebirth/BGAnimations/ScreenGameplay overlay/elements/_gameplaycustomization.lua
@@ -61,7 +61,6 @@ local t = Def.ActorFrame {
     EndCommand = function(self)
         -- exiting customize gameplay will turn off autoplay
         GAMESTATE:SetAutoplay(false)
-        playerConfig:save()
     end,
 }
 

diff --git a/Themes/Rebirth/BGAnimations/ScreenGameplay overlay/elements/_gameplayelements.lua b/Themes/Rebirth/BGAnimations/ScreenGameplay overlay/elements/_gameplayelements.lua
@@ -14,6 +14,12 @@ local t = Def.ActorFrame {
         -- queue so it doesnt reach the children
         self:queuecommand("SetUpMovableValues")
     end,
+    EndCommand = function(self)
+        -- exiting the screen saves customization changes
+        playerConfig:get_data().CurrentWidth = SCREEN_WIDTH
+        playerConfig:get_data().CurrentHeight = SCREEN_HEIGHT
+        playerConfig:save()
+    end,
     SetUpMovableValuesMessageCommand = function(self)
         local screen = SCREENMAN:GetTopScreen()
         local usingReverse = GAMESTATE:GetPlayerState():GetCurrentPlayerOptions():UsingReverse()

diff --git a/Themes/Rebirth/Scripts/02 CustomizeGameplay.lua b/Themes/Rebirth/Scripts/02 CustomizeGameplay.lua
@@ -7,6 +7,10 @@ allowedCustomization = false
 local function loadValuesTable()
     allowedCustomization = playerConfig:get_data().CustomizeGameplay
     usingReverse = GAMESTATE:GetPlayerState():GetCurrentPlayerOptions():UsingReverse()
+
+    local ratioX = SCREEN_WIDTH / playerConfig:get_data().CurrentWidth
+    local ratioY = SCREEN_HEIGHT / playerConfig:get_data().CurrentHeight
+
     MovableValues.ScreenZoom = playerConfig:get_data().GameplaySizes[keymode].ScreenZoom
     MovableValues.ScreenX = playerConfig:get_data().GameplayXYCoordinates[keymode].ScreenX
     MovableValues.ScreenY = playerConfig:get_data().GameplayXYCoordinates[keymode].ScreenY
@@ -80,6 +84,22 @@ local function loadValuesTable()
     MovableValues.MeasureCounterX = playerConfig:get_data().GameplayXYCoordinates[keymode].MeasureCounterX
     MovableValues.MeasureCounterY = playerConfig:get_data().GameplayXYCoordinates[keymode].MeasureCounterY
     MovableValues.MeasureCounterZoom = playerConfig:get_data().GameplaySizes[keymode].MeasureCounterZoom
+
+    -- if the aspect ratio changed at all we need to reset all these numbers
+    if ratioX ~= 1 or ratioY ~= 1 then
+        for name, val in pairs(MovableValues) do
+            if name:find("X$") ~= nil or name:find("Y$") ~= nil or name:find("Rotation$") ~= nil then
+                -- coordinates
+                playerConfig:get_data().GameplayXYCoordinates[keymode][name] = val
+            elseif name:find("Zoom$") ~= nil or name:find("Height$") ~= nil or name:find("Width$") ~= nil or name:find("Spacing$") ~= nil then
+                -- sizes
+                playerConfig:get_data().GameplaySizes[keymode][name] = val
+            end
+        end
+        playerConfig:get_data().CurrentWidth = SCREEN_WIDTH
+        playerConfig:get_data().CurrentHeight = SCREEN_HEIGHT
+        playerConfig:save()
+    end
 end
 
 -- registry for elements which are able to be modified in customizegameplay