Skip to content

Commit 14ec335

Browse files
committed
Fixed bug with simple mode and random difficulty sliders
1 parent b1ead63 commit 14ec335

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

objects/SetupChecker/script.lua

+20-21
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ function updateScenario(value, updateUI)
378378
else
379379
Global.setVar("scenarioCard", getObjectFromGUID(scenarios[value]))
380380
Global.setVar("useRandomScenario", false)
381-
checkToDisableRandomDifficulty()
381+
checkRandomDifficulty(false)
382382
end
383383
updateDifficulty()
384384

@@ -406,7 +406,7 @@ function updateLeadingAdversary(value, updateUI)
406406
else
407407
Global.setVar("adversaryCard", getObjectFromGUID(adversaries[value]))
408408
Global.setVar("useRandomAdversary", false)
409-
checkToDisableRandomDifficulty()
409+
checkRandomDifficulty(false)
410410
end
411411
if value == "None" or value == "Random" then
412412
updateLeadingLevel(0, updateUI)
@@ -440,7 +440,7 @@ function updateSupportingAdversary(value, updateUI)
440440
else
441441
Global.setVar("adversaryCard2", getObjectFromGUID(adversaries[value]))
442442
Global.setVar("useSecondAdversary", false)
443-
checkToDisableRandomDifficulty()
443+
checkRandomDifficulty(false)
444444
end
445445
if value == "None" or value == "Random" then
446446
updateSupportingLevel(0, updateUI)
@@ -580,7 +580,7 @@ function updateBoardLayout(value, updateUI)
580580
else
581581
Global.setVar("useRandomBoard", false)
582582
Global.setVar("includeThematic", false)
583-
checkToDisableRandomDifficulty()
583+
checkRandomDifficulty(false)
584584
end
585585
Global.setVar("boardLayout", value)
586586
updateDifficulty()
@@ -830,10 +830,7 @@ function toggleSimpleMode()
830830
self.UI.setAttribute("leadingText", "text", "Adversary")
831831
self.UI.setAttribute("supportingHeader", "visibility", "Invisible")
832832
self.UI.setAttribute("supportingRow", "visibility", "Invisible")
833-
self.UI.setAttribute("minTextRow", "visibility", "Invisible")
834-
self.UI.setAttribute("minRow", "visibility", "Invisible")
835-
self.UI.setAttribute("maxTextRow", "visibility", "Invisible")
836-
self.UI.setAttribute("maxRow", "visibility", "Invisible")
833+
checkRandomDifficulty(false)
837834
self.UI.setAttribute("blightCardRow", "visibility", "")
838835
self.UI.setAttribute("optionalCell", "visibility", "Invisible")
839836
self.UI.setAttribute("toggles", "visibility", "Invisible")
@@ -848,10 +845,7 @@ function toggleSimpleMode()
848845
self.UI.setAttribute("leadingText", "text", "Leading Adversary")
849846
self.UI.setAttribute("supportingHeader", "visibility", "")
850847
self.UI.setAttribute("supportingRow", "visibility", "")
851-
self.UI.setAttribute("minTextRow", "visibility", "")
852-
self.UI.setAttribute("minRow", "visibility", "")
853-
self.UI.setAttribute("maxTextRow", "visibility", "")
854-
self.UI.setAttribute("maxRow", "visibility", "")
848+
checkRandomDifficulty(true)
855849
self.UI.setAttribute("blightCardRow", "visibility", "Invisible")
856850
self.UI.setAttribute("optionalCell", "visibility", "")
857851
self.UI.setAttribute("toggles", "visibility", "")
@@ -916,15 +910,20 @@ function enableRandomDifficulty()
916910
self.UI.setAttribute("maxTextRow", "visibility", "")
917911
self.UI.setAttribute("maxRow", "visibility", "")
918912
end
919-
function checkToDisableRandomDifficulty()
920-
if not Global.getVar("useRandomAdversary")
921-
and not Global.getVar("useSecondAdversary")
922-
and not Global.getVar("useRandomBoard")
923-
and not Global.getVar("useRandomScenario") then
924-
self.UI.setAttribute("minTextRow", "visibility", "Invisible")
925-
self.UI.setAttribute("minRow", "visibility", "Invisible")
926-
self.UI.setAttribute("maxTextRow", "visibility", "Invisible")
927-
self.UI.setAttribute("maxRow", "visibility", "Invisible")
913+
function checkRandomDifficulty(enable)
914+
local visibility = ""
915+
if not enable then
916+
visibility = "Invisible"
917+
end
918+
local random = Global.getVar("useRandomAdversary")
919+
or Global.getVar("useSecondAdversary")
920+
or Global.getVar("useRandomBoard")
921+
or Global.getVar("useRandomScenario")
922+
if random == enable then
923+
self.UI.setAttribute("minTextRow", "visibility", visibility)
924+
self.UI.setAttribute("minRow", "visibility", visibility)
925+
self.UI.setAttribute("maxTextRow", "visibility", visibility)
926+
self.UI.setAttribute("maxRow", "visibility", visibility)
928927
end
929928
end
930929

0 commit comments

Comments
 (0)