From efa0ef763f8c27165c05e3d585c75aa44e0a9ed9 Mon Sep 17 00:00:00 2001
From: Chr1Z93 <puls.christian@gmail.com>
Date: Sun, 29 Sep 2024 22:34:49 +0200
Subject: [PATCH] updated bottom bar

---
 modsettings/CustomUIAssets.json  |  9 ++-----
 src/core/Global.ttslua           | 31 +++++++++++------------
 xml/Global/BlessCurseManager.xml | 25 ++-----------------
 xml/Global/BottomBar.xml         | 43 +++++++++++++++++---------------
 4 files changed, 41 insertions(+), 67 deletions(-)

diff --git a/modsettings/CustomUIAssets.json b/modsettings/CustomUIAssets.json
index 5ca63e31..9c0e8dd9 100644
--- a/modsettings/CustomUIAssets.json
+++ b/modsettings/CustomUIAssets.json
@@ -105,14 +105,9 @@
     "URL": "https://steamusercontent-a.akamaihd.net/ugc/2450610458480705628/FE3FD9F32E8704BEB7DD6327225D9D8244115A48/"
   },
   {
-    "Name": "arrow-down",
+    "Name": "blurse",
     "Type": 0,
-    "URL": "https://steamusercontent-a.akamaihd.net/ugc/2448359292156394304/63B2D48BB94DD4CD4F897D8528E049D521298B02/"
-  },
-  {
-    "Name": "caret",
-    "Type": 0,
-    "URL": "https://steamusercontent-a.akamaihd.net/ugc/2448359292156394421/CFAF0262FEDE662D399A5D786E7450B49B952C99/"
+    "URL": "https://steamusercontent-a.akamaihd.net/ugc/2448359292169458161/DDF4F777B738E2BDD9AF7B3B98AF200DB12485C0/"
   },
   {
     "Name": "Exit",
diff --git a/src/core/Global.ttslua b/src/core/Global.ttslua
index c0e778b9..ef9e0b83 100644
--- a/src/core/Global.ttslua
+++ b/src/core/Global.ttslua
@@ -1176,25 +1176,25 @@ function onClick_spawnPlaceholder(player)
   changeWindowVisibilityForColor(player.color, "downloadWindow", false)
 end
 
--- toggles the visibility of the bless / curse manager UI
-function showHideBlurse(player)
-  local visibility = changeWindowVisibilityForColor(player.color, "blessCurseManager")
-  changeWindowVisibilityForColor(player.color, "hideBlurse", visibility)
-  blurseVisibility[player.color] = visibility
-end
-
 -- toggles the visibility of the respective UI
 ---@param player tts__Player Player that triggered this
 ---@param windowId string Name of the UI to toggle
 function onClick_toggleUi(player, windowId)
+  -- let the Navigation Overlay handle the toggling of its visibility modes
   if windowId == "Navigation Overlay" then
     navigationOverlayApi.cycleVisibility(player.color)
     return
   end
 
   -- hide the playAreaGallery / downloadWindow if visible
-  if windowId == "downloadWindow" or windowId == "playAreaGallery" then
-    changeWindowVisibilityForColor(player.color, windowId, false)
+  if windowId == "downloadWindow" then
+    changeWindowVisibilityForColor(player.color, "playAreaGallery", false)
+  elseif windowId == "playAreaGallery" then
+    changeWindowVisibilityForColor(player.color, "downloadWindow", false)
+  elseif windowId == "blessCurseManager" then
+    -- store the state of the Bless/Curse Manager UI to restore it onLoad()
+    blurseVisibility[player.color] = changeWindowVisibilityForColor(player.color, "blessCurseManager")
+    return
   end
 
   changeWindowVisibilityForColor(player.color, windowId)
@@ -1900,16 +1900,13 @@ function applyHidingToCard(card, handColor)
   end
 end
 
+-- loads the visibility of the Bless/Curse Manager XML from the internal variable
 function updateBlurseVisibility()
-  function coroBlurse()
-    for playerColor, state in pairs(blurseVisibility) do
-      changeWindowVisibilityForColor(playerColor, "blessCurseManager", state)
-      changeWindowVisibilityForColor(playerColor, "hideBlurse", state)
-      coroutine.yield()
-    end
-    return 1
+  local count = 1
+  for playerColor, state in pairs(blurseVisibility) do
+    Wait.frames(function() changeWindowVisibilityForColor(playerColor, "blessCurseManager", state) end, count)
+    count = count + 3
   end
-  startLuaCoroutine(Global, "coroBlurse")
 end
 
 ---------------------------------------------------------
diff --git a/xml/Global/BlessCurseManager.xml b/xml/Global/BlessCurseManager.xml
index 947e8f02..5cbe6b59 100644
--- a/xml/Global/BlessCurseManager.xml
+++ b/xml/Global/BlessCurseManager.xml
@@ -10,30 +10,8 @@
     offsetXY="0 69"
     outlineSize="2 2"
     outline="#303030"/>
-  <Button class="blurseButton"
-    onClick="showHideBlurse"
-    tooltipPosition="Left"
-    tooltipBackgroundColor="rgba(0,0,0,1)"
-    color="White" />
 </Defaults>
 
-<!-- show button for the Bless / Curse Manager -->
-<Panel class="showHide"
-  id="showBlurse">
-  <Button class="blurseButton"
-    tooltip="Show Bless/Curse Manager"
-    image="arrow-down"/>
-</Panel>
-
-<!-- hide button for the Bless / Curse Manager -->
-<Panel class="showHide"
-  active="false"
-  id="hideBlurse">
-  <Button class="blurseButton"
-    tooltip="Hide Bless/Curse Manager"
-    image="caret"/>
-</Panel>
-
 <!-- window to control bless / curse tokens in chaos bag -->
 <!-- height = row heights + 2x outline -->
 <TableLayout id="blessCurseManager"
@@ -41,7 +19,8 @@
   active="false"
   height="104"
   width="144"
-  rectAlignment="MiddleRight"
+  offsetXY="-1 250"
+  rectAlignment="LowerRight"
   raycastTarget="true"
   outlineSize="2 2"
   outline="#303030">
diff --git a/xml/Global/BottomBar.xml b/xml/Global/BottomBar.xml
index f5b5fb66..34b06bdc 100644
--- a/xml/Global/BottomBar.xml
+++ b/xml/Global/BottomBar.xml
@@ -1,20 +1,28 @@
 <Defaults>
   <Button class="navbar"
+    tooltipOffset="-135"
     tooltipPosition="Left"
     tooltipBackgroundColor="rgba(0,0,0,1)"
     color="clear"/>
+  <VerticalLayout class="navbar"
+    width="800"
+    padding="70 70 70 70"
+    scale="0.05 0.05 1"
+    color="#000000"
+    outlineSize="20 20"
+    outline="#303030"
+    rectAlignment="LowerRight"/>
 </Defaults>
 
-<!-- Buttons at the bottom right (height: n * width + spacing) -->
-<VerticalLayout visibility="Admin"
-  color="#000000"
-  outlineSize="1 1"
-  outline="#303030"
-  rectAlignment="LowerRight"
-  width="38"
-  height="78"
-  offsetXY="-1 123"
-  spacing="2">
+<!-- Buttons at the bottom right (height: n * width) -->
+<VerticalLayout class="navbar"
+  visibility="Admin"
+  height="2400"
+  offsetXY="-1 120">
+  <Button class="navbar"
+    icon="blurse"
+    tooltip="Bless/Curse Manager"
+    onClick="onClick_toggleUi(blessCurseManager)"/>
   <Button class="navbar"
     icon="devourer"
     tooltip="Downloadable Content"
@@ -25,17 +33,12 @@
     onClick="onClick_toggleUi(optionPanel)"/>
 </VerticalLayout>
 
-<!-- Navigation Overlay button (not visibly to Grey and Black) -->
-<Panel visibility="White|Brown|Red|Orange|Yellow|Green|Teal|Blue|Purple|Pink"
-  color="#000000"
-  outlineSize="1 1"
-  outline="#303030"
-  rectAlignment="LowerRight"
-  width="38"
-  height="38"
-  offsetXY="-1 85">
+<!-- Navigation Overlay button -->
+<VerticalLayout class="navbar"
+  height="800"
+  offsetXY="-1 80">
   <Button class="navbar"
     icon="NavigationOverlayIcon"
     tooltip="Navigation Overlay"
     onClick="onClick_toggleUi(Navigation Overlay)"/>
-</Panel>
\ No newline at end of file
+</VerticalLayout>