44 files changed, 29 insertions, 7 deletions

diff --git a/assets/opensb/interface/actionbar/actionbarbottombg.png b/assets/opensb/interface/actionbar/actionbarbottombg.png
index df7e9e2..685ce2a 100644
--- a/assets/opensb/interface/actionbar/actionbarbottombg.png
+++ b/assets/opensb/interface/actionbar/actionbarbottombg.png
diff --git a/assets/opensb/interface/building/collisionblock.png b/assets/opensb/interface/building/collisionblock.png
index b1d5f9d..5f78e28 100644
--- a/assets/opensb/interface/building/collisionblock.png
+++ b/assets/opensb/interface/building/collisionblock.png
diff --git a/assets/opensb/interface/building/collisionempty.png b/assets/opensb/interface/building/collisionempty.png
index 6289ba1..6f8f66f 100644
--- a/assets/opensb/interface/building/collisionempty.png
+++ b/assets/opensb/interface/building/collisionempty.png
diff --git a/assets/opensb/interface/building/collisionplatform.png b/assets/opensb/interface/building/collisionplatform.png
index b8b2b65..4744f82 100644
--- a/assets/opensb/interface/building/collisionplatform.png
+++ b/assets/opensb/interface/building/collisionplatform.png
diff --git a/assets/opensb/interface/graphicsmenu/body.png b/assets/opensb/interface/graphicsmenu/body.png
index 198ca05..e721afa 100644
--- a/assets/opensb/interface/graphicsmenu/body.png
+++ b/assets/opensb/interface/graphicsmenu/body.png
diff --git a/assets/opensb/interface/opensb/bindings/bind.png b/assets/opensb/interface/opensb/bindings/bind.png
index 64efa20..fcf492a 100644
--- a/assets/opensb/interface/opensb/bindings/bind.png
+++ b/assets/opensb/interface/opensb/bindings/bind.png
diff --git a/assets/opensb/interface/opensb/bindings/bindname.png b/assets/opensb/interface/opensb/bindings/bindname.png
index c4ee548..f7c4500 100644
--- a/assets/opensb/interface/opensb/bindings/bindname.png
+++ b/assets/opensb/interface/opensb/bindings/bindname.png
diff --git a/assets/opensb/interface/opensb/bindings/body.png b/assets/opensb/interface/opensb/bindings/body.png
index a63b6fd..272ed29 100644
--- a/assets/opensb/interface/opensb/bindings/body.png
+++ b/assets/opensb/interface/opensb/bindings/body.png
diff --git a/assets/opensb/interface/opensb/bindings/category.png b/assets/opensb/interface/opensb/bindings/category.png
index 115f33c..66f5cdb 100644
--- a/assets/opensb/interface/opensb/bindings/category.png
+++ b/assets/opensb/interface/opensb/bindings/category.png
diff --git a/assets/opensb/interface/opensb/bindings/categoryback.png b/assets/opensb/interface/opensb/bindings/categoryback.png
index 3bff20b..ed838f3 100644
--- a/assets/opensb/interface/opensb/bindings/categoryback.png
+++ b/assets/opensb/interface/opensb/bindings/categoryback.png
diff --git a/assets/opensb/interface/opensb/bindings/footer.png b/assets/opensb/interface/opensb/bindings/footer.png
index 151f336..426f8a6 100644
--- a/assets/opensb/interface/opensb/bindings/footer.png
+++ b/assets/opensb/interface/opensb/bindings/footer.png
diff --git a/assets/opensb/interface/opensb/bindings/garbage.png b/assets/opensb/interface/opensb/bindings/garbage.png
index aa3e15f..3069741 100644
--- a/assets/opensb/interface/opensb/bindings/garbage.png
+++ b/assets/opensb/interface/opensb/bindings/garbage.png
diff --git a/assets/opensb/interface/opensb/bindings/groupname.png b/assets/opensb/interface/opensb/bindings/groupname.png
index c447114..3019556 100644
--- a/assets/opensb/interface/opensb/bindings/groupname.png
+++ b/assets/opensb/interface/opensb/bindings/groupname.png
diff --git a/assets/opensb/interface/opensb/bindings/header.png b/assets/opensb/interface/opensb/bindings/header.png
index fa6ec21..287d220 100644
--- a/assets/opensb/interface/opensb/bindings/header.png
+++ b/assets/opensb/interface/opensb/bindings/header.png
diff --git a/assets/opensb/interface/opensb/bindings/reset.png b/assets/opensb/interface/opensb/bindings/reset.png
index f516834..a75fd9c 100644
--- a/assets/opensb/interface/opensb/bindings/reset.png
+++ b/assets/opensb/interface/opensb/bindings/reset.png
diff --git a/assets/opensb/interface/opensb/voicechat/activity.png b/assets/opensb/interface/opensb/voicechat/activity.png
index 20286e7..4fecc5d 100644
--- a/assets/opensb/interface/opensb/voicechat/activity.png
+++ b/assets/opensb/interface/opensb/voicechat/activity.png
diff --git a/assets/opensb/interface/opensb/voicechat/activityback.png b/assets/opensb/interface/opensb/voicechat/activityback.png
index 8308c3d..a88f7f0 100644
--- a/assets/opensb/interface/opensb/voicechat/activityback.png
+++ b/assets/opensb/interface/opensb/voicechat/activityback.png
diff --git a/assets/opensb/interface/opensb/voicechat/bigbutton.png b/assets/opensb/interface/opensb/voicechat/bigbutton.png
index 2908feb..d1ff171 100644
--- a/assets/opensb/interface/opensb/voicechat/bigbutton.png
+++ b/assets/opensb/interface/opensb/voicechat/bigbutton.png
diff --git a/assets/opensb/interface/opensb/voicechat/bigbuttonback.png b/assets/opensb/interface/opensb/voicechat/bigbuttonback.png
index fe10770..663da60 100644
--- a/assets/opensb/interface/opensb/voicechat/bigbuttonback.png
+++ b/assets/opensb/interface/opensb/voicechat/bigbuttonback.png
diff --git a/assets/opensb/interface/opensb/voicechat/body.png b/assets/opensb/interface/opensb/voicechat/body.png
index 37f73a8..c76bbb4 100644
--- a/assets/opensb/interface/opensb/voicechat/body.png
+++ b/assets/opensb/interface/opensb/voicechat/body.png
diff --git a/assets/opensb/interface/opensb/voicechat/device.png b/assets/opensb/interface/opensb/voicechat/device.png
index b686b60..5250946 100644
--- a/assets/opensb/interface/opensb/voicechat/device.png
+++ b/assets/opensb/interface/opensb/voicechat/device.png
diff --git a/assets/opensb/interface/opensb/voicechat/deviceback.png b/assets/opensb/interface/opensb/voicechat/deviceback.png
index b07990b..8f25473 100644
--- a/assets/opensb/interface/opensb/voicechat/deviceback.png
+++ b/assets/opensb/interface/opensb/voicechat/deviceback.png
diff --git a/assets/opensb/interface/opensb/voicechat/footer.png b/assets/opensb/interface/opensb/voicechat/footer.png
index 39069c9..98fa09b 100644
--- a/assets/opensb/interface/opensb/voicechat/footer.png
+++ b/assets/opensb/interface/opensb/voicechat/footer.png
diff --git a/assets/opensb/interface/opensb/voicechat/header.png b/assets/opensb/interface/opensb/voicechat/header.png
index a1be25d..ab6b123 100644
--- a/assets/opensb/interface/opensb/voicechat/header.png
+++ b/assets/opensb/interface/opensb/voicechat/header.png
diff --git a/assets/opensb/interface/opensb/voicechat/indicator/back.png b/assets/opensb/interface/opensb/voicechat/indicator/back.png
index 869ed1c..44b8147 100644
--- a/assets/opensb/interface/opensb/voicechat/indicator/back.png
+++ b/assets/opensb/interface/opensb/voicechat/indicator/back.png
diff --git a/assets/opensb/interface/opensb/voicechat/indicator/front.png b/assets/opensb/interface/opensb/voicechat/indicator/front.png
index ff32e38..3a8e511 100644
--- a/assets/opensb/interface/opensb/voicechat/indicator/front.png
+++ b/assets/opensb/interface/opensb/voicechat/indicator/front.png
diff --git a/assets/opensb/interface/opensb/voicechat/indicator/front_muted.png b/assets/opensb/interface/opensb/voicechat/indicator/front_muted.png
index be18587..e444545 100644
--- a/assets/opensb/interface/opensb/voicechat/indicator/front_muted.png
+++ b/assets/opensb/interface/opensb/voicechat/indicator/front_muted.png
diff --git a/assets/opensb/interface/opensb/voicechat/pushtotalk.png b/assets/opensb/interface/opensb/voicechat/pushtotalk.png
index 6d38221..ffcf1ac 100644
--- a/assets/opensb/interface/opensb/voicechat/pushtotalk.png
+++ b/assets/opensb/interface/opensb/voicechat/pushtotalk.png
diff --git a/assets/opensb/interface/opensb/voicechat/pushtotalkback.png b/assets/opensb/interface/opensb/voicechat/pushtotalkback.png
index 3cc3a73..7fc85c0 100644
--- a/assets/opensb/interface/opensb/voicechat/pushtotalkback.png
+++ b/assets/opensb/interface/opensb/voicechat/pushtotalkback.png
diff --git a/assets/opensb/interface/optionsmenu/body_blank.png b/assets/opensb/interface/optionsmenu/body_blank.png
index dcb6112..d770341 100644
--- a/assets/opensb/interface/optionsmenu/body_blank.png
+++ b/assets/opensb/interface/optionsmenu/body_blank.png
diff --git a/assets/opensb/interface/optionsmenu/duocontrolsbutton.png b/assets/opensb/interface/optionsmenu/duocontrolsbutton.png
index 1d40af3..5ae49fa 100644
--- a/assets/opensb/interface/optionsmenu/duocontrolsbutton.png
+++ b/assets/opensb/interface/optionsmenu/duocontrolsbutton.png
diff --git a/assets/opensb/interface/optionsmenu/duocontrolsbuttonhover.png b/assets/opensb/interface/optionsmenu/duocontrolsbuttonhover.png
index bdeb055..b43f732 100644
--- a/assets/opensb/interface/optionsmenu/duocontrolsbuttonhover.png
+++ b/assets/opensb/interface/optionsmenu/duocontrolsbuttonhover.png
diff --git a/assets/opensb/interface/optionsmenu/shine.png b/assets/opensb/interface/optionsmenu/shine.png
index 0117c5f..5e4a1f9 100644
--- a/assets/opensb/interface/optionsmenu/shine.png
+++ b/assets/opensb/interface/optionsmenu/shine.png
diff --git a/assets/opensb/interface/optionsmenu/tricontrolsbutton.png b/assets/opensb/interface/optionsmenu/tricontrolsbutton.png
index 1a2a6ed..0c2ad7a 100644
--- a/assets/opensb/interface/optionsmenu/tricontrolsbutton.png
+++ b/assets/opensb/interface/optionsmenu/tricontrolsbutton.png
diff --git a/assets/opensb/interface/optionsmenu/tricontrolsbuttonhover.png b/assets/opensb/interface/optionsmenu/tricontrolsbuttonhover.png
index ba57e02..7bf9653 100644
--- a/assets/opensb/interface/optionsmenu/tricontrolsbuttonhover.png
+++ b/assets/opensb/interface/optionsmenu/tricontrolsbuttonhover.png
diff --git a/assets/opensb/interface/title/barstound.png b/assets/opensb/interface/title/barstound.png
new file mode 100644
index 0000000..6c17d8d
--- /dev/null
+++ b/assets/opensb/interface/title/barstound.png
diff --git a/assets/opensb/interface/title/starbound.png b/assets/opensb/interface/title/starbound.png
index a87f872..24ea4d4 100644
--- a/assets/opensb/interface/title/starbound.png
+++ b/assets/opensb/interface/title/starbound.png
diff --git a/assets/opensb/interface/windowconfig/title.config.patch b/assets/opensb/interface/windowconfig/title.config.patch
deleted file mode 100644
index a120e11..0000000
--- a/assets/opensb/interface/windowconfig/title.config.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "skyBackdropDarken" : [0, 0, 0, 64],
-  "backdropImages" : [ [ [0, 0], "/interface/title/starbound.png", 0.5, [0.5, 0.5] ] ]
-}
\ No newline at end of file
diff --git a/assets/opensb/interface/windowconfig/title.config.patch.lua b/assets/opensb/interface/windowconfig/title.config.patch.lua
new file mode 100644
index 0000000..c5d9e57
--- /dev/null
+++ b/assets/opensb/interface/windowconfig/title.config.patch.lua
@@ -0,0 +1,17 @@
+function patch(data)
+  for i, v in pairs(data.mainMenuButtons) do
+    if not v.rightAnchored then
+      v.offset[2] = v.offset[2] + (v.key == "quit" and -5 or 15)
+    end
+  end
+  data.skyBackdropDarken = jarray{0, 0, 0, 64}
+  data.backdropImages = jarray{
+    jarray{
+      jarray{0, 0}, 
+      "/interface/title/" .. (sb.makeRandomSource():randUInt(100) == 0 and "barst" or "starb") .. "ound.png",
+      0.5,
+      jarray{0.5, 0.5}
+    }
+  }
+  return data
+end
\ No newline at end of file
diff --git a/assets/opensb/items/tools/inspectiontool/inspectionmodeicon.png b/assets/opensb/items/tools/inspectiontool/inspectionmodeicon.png
index 05475e5..2ba0112 100644
--- a/assets/opensb/items/tools/inspectiontool/inspectionmodeicon.png
+++ b/assets/opensb/items/tools/inspectiontool/inspectionmodeicon.png
diff --git a/assets/opensb/tiles/shadows.png b/assets/opensb/tiles/shadows.png
index fc34769..28bb7a3 100644
--- a/assets/opensb/tiles/shadows.png
+++ b/assets/opensb/tiles/shadows.png
diff --git a/source/base/StarAssets.cpp b/source/base/StarAssets.cpp
index f1c1009..01a6001 100644
--- a/source/base/StarAssets.cpp
+++ b/source/base/StarAssets.cpp
@@ -103,7 +103,8 @@ Maybe<RectU> FramesSpecification::getRect(String const& frame) const {
 }
 
 Assets::Assets(Settings settings, StringList assetSources) {
-  const char* const AssetsPatchSuffix = ".patch";
+  const char* AssetsPatchSuffix = ".patch";
+  const char* AssetsLuaPatchSuffix = ".patch.lua";
 
   m_settings = std::move(settings);
   m_stopThreads = false;
@@ -190,6 +191,10 @@ Assets::Assets(Settings settings, StringList assetSources) {
           auto targetPatchFile = filename.substr(0, filename.size() - strlen(AssetsPatchSuffix));
           if (auto p = m_files.ptr(targetPatchFile))
             p->patchSources.append({filename, source});
+        } else if (filename.endsWith(AssetsLuaPatchSuffix, String::CaseInsensitive)) {
+          auto targetPatchFile = filename.substr(0, filename.size() - strlen(AssetsLuaPatchSuffix));
+          if (auto p = m_files.ptr(targetPatchFile))
+            p->patchSources.append({filename, source});
         } else {
           for (int i = 0; i < 10; i++) {
             if (filename.endsWith(AssetsPatchSuffix + toString(i), String::CaseInsensitive)) {
diff --git a/source/client/StarClientApplication.cpp b/source/client/StarClientApplication.cpp
index e97a8b7..bcdc077 100644
--- a/source/client/StarClientApplication.cpp
+++ b/source/client/StarClientApplication.cpp
@@ -110,7 +110,7 @@ Json const AdditionalDefaultConfiguration = Json::parseJson(R"JSON(
         "ChatBegin" :  [ { "type" : "key", "value" : "Return", "mods" : [] } ],
         "ChatBeginCommand" :  [ { "type" : "key", "value" : "/", "mods" : [] } ],
         "ChatStop" :  [ { "type" : "key", "value" : "Esc", "mods" : [] } ],
-        "InterfaceHideHud" :  [ { "type" : "key", "value" : "Z", "mods" : [ "LAlt" ] } ],
+        "InterfaceHideHud" :  [ { "type" : "key", "value" : "F1", "mods" : [] } ],
         "InterfaceChangeBarGroup" :  [ { "type" : "key", "value" : "X", "mods" : [] } ],
         "InterfaceDeselectHands" :  [ { "type" : "key", "value" : "Z", "mods" : [] } ],
         "InterfaceBar1" :  [ { "type" : "key", "value" : "1", "mods" : [] } ],
@@ -129,7 +129,7 @@ Json const AdditionalDefaultConfiguration = Json::parseJson(R"JSON(
         "EssentialBar4" :  [ { "type" : "key", "value" : "N", "mods" : [] } ],
         "InterfaceRepeatCommand" :  [ { "type" : "key", "value" : "P", "mods" : [] } ],
         "InterfaceToggleFullscreen" :  [ { "type" : "key", "value" : "F11", "mods" : [] } ],
-        "InterfaceReload" :  [ ],
+        "InterfaceReload" :  [],
         "InterfaceEscapeMenu" :  [ { "type" : "key", "value" : "Esc", "mods" : [] } ],
         "InterfaceInventory" :  [ { "type" : "key", "value" : "I", "mods" : [] } ],
         "InterfaceCodex" :  [ { "type" : "key", "value" : "L", "mods" : [] } ],
diff --git a/source/core/StarImageProcessing.cpp b/source/core/StarImageProcessing.cpp
index a56cedc..98f65f4 100644
--- a/source/core/StarImageProcessing.cpp
+++ b/source/core/StarImageProcessing.cpp
@@ -446,6 +446,10 @@ StringList imageOperationReferences(List<ImageOperation> const& operations) {
 }
 
 void processImageOperation(ImageOperation const& operation, Image& image, ImageReferenceCallback refCallback) {
+  if (image.bytesPerPixel() == 3) {
+    // Convert to an image format that has alpha so certain operations function properly
+    image = image.convert(image.pixelFormat() == PixelFormat::BGR24 ? PixelFormat::BGRA32 : PixelFormat::RGBA32);
+  }
   if (auto op = operation.ptr<HueShiftImageOperation>()) {
     image.forEachPixel([&op](unsigned, unsigned, Vec4B& pixel) {
       if (pixel[3] != 0)