feat: Opacity effect and missile in options (#676)

* feat: Opacity effect and missile in options issue of "roriscrave" in otland * OTC naming convention OTC naming convention * test review conde2 - with bug (opacity in tile) * fix: capital letter * line * Update modules/client_options/general.otui Co-authored-by: Caio Santoro dos Santos <61211407+csantbr@users.noreply.github.com> * Fix: Opacity tile --------- Co-authored-by: Caio Santoro dos Santos <61211407+csantbr@users.noreply.github.com>
mehah · Dec 13, 2023 · 295db73 · BenDol · Dec 13, 2023 · kokekanon
1 parent e0a21e0
commit 295db73
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 1 deletion.
diff --git a/modules/client_options/general.otui b/modules/client_options/general.otui
@@ -83,6 +83,38 @@ Panel
     margin-top: 3
     minimum: 1
     maximum: 9
+
+  Label
+    id: setEffectAlphaLabel
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.top: prev.bottom
+    margin-top: 12
+
+  OptionScrollbar
+    id: setEffectAlphaScroll
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.top: prev.bottom
+    margin-top: 3
+    minimum: 10
+    maximum: 100
+
+  Label
+    id: setMissileAlphaLabel
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.top: prev.bottom
+    margin-top: 12
+
+  OptionScrollbar
+    id: setMissileAlphaScroll
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.top: prev.bottom
+    margin-top: 3
+    minimum: 10
+    maximum: 100
 
   Label
     id: chooseCrosshairLabel

diff --git a/modules/client_options/options.lua b/modules/client_options/options.lua
@@ -45,7 +45,9 @@ local defaultOptions = {
     asyncTxtLoading = false,
     creatureInformationScale = 0,
     staticTextScale = 0,
-    animatedTextScale = 0
+    animatedTextScale = 0,
+    setEffectAlphaScroll = 100 ,
+    setMissileAlphaScroll = 100 ,
 }
 
 local optionsWindow
@@ -352,6 +354,13 @@ function setOption(key, value, force)
         local fadeMode = value == 1
         graphicsPanel:getChildById('floorFading'):setEnabled(fadeMode)
         graphicsPanel:getChildById('floorFadingLabel'):setEnabled(fadeMode)
+
+    elseif key == 'setEffectAlphaScroll' then
+        g_client.setEffectAlpha(value/100)
+        generalPanel:getChildById('setEffectAlphaLabel'):setText(tr('Opacity Effect: %s%%', value))
+    elseif key == 'setMissileAlphaScroll' then
+        g_client.setMissileAlpha(value/100)
+        generalPanel:getChildById('setMissileAlphaLabel'):setText(tr('Opacity Missile: %s%%', value))
     end
 
     -- change value for keybind updates

diff --git a/src/client/client.h b/src/client/client.h
@@ -49,8 +49,16 @@ class Client : public ApplicationDrawEvents
 
     UIMapPtr getMapWidget() { return m_mapWidget; }
 
+    float getEffectAlpha() const { return m_effectAlpha; }
+    void setEffectAlpha(float v) { m_effectAlpha = v; }
+
+    float getMissileAlpha() const { return m_missileAlpha; }
+    void setMissileAlpha(float v) { m_missileAlpha = v; }
+
 private:
     UIMapPtr m_mapWidget;
+    float m_effectAlpha{ PlatformWindow::DEFAULT_DISPLAY_DENSITY };
+    float m_missileAlpha{ PlatformWindow::DEFAULT_DISPLAY_DENSITY };
 };
 
 extern Client g_client;
diff --git a/src/client/effect.cpp b/src/client/effect.cpp
@@ -25,6 +25,7 @@
 #include <framework/core/graphicalapplication.h>
 #include "game.h"
 #include "map.h"
+#include <client/client.h>
 
 void Effect::draw(const Point& dest, bool drawThings, LightView* lightView)
 {
@@ -73,6 +74,8 @@ void Effect::draw(const Point& dest, bool drawThings, LightView* lightView)
         m_drawConductor.order = DrawOrder::FOURTH;
     }
 
+    if (drawThings &&  g_client.getEffectAlpha() < 1.f)
+        g_drawPool.setOpacity(g_client.getEffectAlpha(), true);
     getThingType()->draw(dest, 0, xPattern, yPattern, 0, animationPhase, Color::white, drawThings, lightView, m_drawConductor);
 }
 

diff --git a/src/client/missile.cpp b/src/client/missile.cpp
@@ -25,13 +25,17 @@
 #include "map.h"
 #include "thingtypemanager.h"
 #include "tile.h"
+#include <client/client.h>
 
 void Missile::draw(const Point& dest, bool drawThings, LightView* lightView)
 {
     if (!canDraw() || isHided())
         return;
 
     const float fraction = m_animationTimer.ticksElapsed() / m_duration;
+
+    if (drawThings && g_client.getMissileAlpha() < 1.f)
+        g_drawPool.setOpacity(g_client.getMissileAlpha(), true);
     getThingType()->draw(dest + m_delta * fraction * g_drawPool.getScaleFactor(), 0, m_numPatternX, m_numPatternY, 0, 0, Color::white, drawThings, lightView, m_drawConductor);
 }
 

diff --git a/src/framework/luafunctions.cpp b/src/framework/luafunctions.cpp
@@ -31,6 +31,7 @@
 #include <framework/platform/platform.h>
 #include <framework/stdext/net.h>
 #include <framework/util/crypt.h>
+#include <client/client.h>
 
 #ifdef FRAMEWORK_GRAPHICS
 #include "framework/graphics/particleeffect.h"
@@ -322,6 +323,11 @@ void Application::registerLuaFunctions()
     g_lua.bindSingletonFunction("g_app", "setCreatureInformationScale", &GraphicalApplication::setCreatureInformationScale, &g_app);
     g_lua.bindSingletonFunction("g_app", "setAnimatedTextScale", &GraphicalApplication::setAnimatedTextScale, &g_app);
     g_lua.bindSingletonFunction("g_app", "setStaticTextScale", &GraphicalApplication::setStaticTextScale, &g_app);
+
+    // Client
+    g_lua.registerSingletonClass("g_client");
+    g_lua.bindSingletonFunction("g_client", "setEffectAlpha", &Client::setEffectAlpha, &g_client);
+    g_lua.bindSingletonFunction("g_client", "setMissileAlpha", &Client::setMissileAlpha, &g_client);
 
     // PlatformWindow
     g_lua.registerSingletonClass("g_window");