From 7d568b5cd01172cdddfd391fe55cabc28bb4d342 Mon Sep 17 00:00:00 2001
From: FajsiEx <fajsiexofficial@gmail.com>
Date: Fri, 22 Oct 2021 21:12:48 +0200
Subject: [PATCH] + proper lines anim

---
 scripts/result.lua                            |  39 ++++++++----------
 .../clear gradient.png => badge_gradient.png} | Bin
 .../{clear lines.png => badge_lines.png}      | Bin
 3 files changed, 18 insertions(+), 21 deletions(-)
 rename textures/result/{panels/clear gradient.png => badge_gradient.png} (100%)
 rename textures/result/{clear lines.png => badge_lines.png} (100%)

diff --git a/scripts/result.lua b/scripts/result.lua
index dbb7a92..16485e2 100644
--- a/scripts/result.lua
+++ b/scripts/result.lua
@@ -23,7 +23,8 @@ local bestScoreBadgeImage = gfx.CreateSkinImage("result/best.png", 0);
 
 local appealCardImage = gfx.CreateSkinImage("appeal_card.png", 0);
 local danBadgeImage = gfx.CreateSkinImage("dan/inf.png", 0);
-local volforceBadgeImage = gfx.CreateSkinImage("volforce/10.png", 0);
+
+local badgeLines = gfx.CreateSkinImage("result/badge_lines.png", 0);
 
 local gradeImages = {
     S = gfx.CreateSkinImage("common/grades/S.png", 0),
@@ -98,18 +99,19 @@ local clearBadgeImages = {
     },
     {
         image = gfx.CreateSkinImage("result/clears/AUTOPLAY.png", 0),
-        xPos = 1080
+        xPos = 1100
     },
 }
 
 -- ANIMS
 local idolAnimation = gfx.LoadSkinAnimation('idol', 1 / 30, 0, true);
--- added new
-local RightPanelAni = gfx.LoadSkinAnimation("result/diagonal anims", 1 / 30, 0, true)
---
+
 local transitionEnterScale = 0;
 local idolAnimTransitionScale = 0;
 
+local badgeLinesAnimScale = 0;
+local badgeLinesAnimOffsetX = 0;
+
 local rightPanelX = 0;
 local rightPanelY = 910;
 
@@ -221,24 +223,11 @@ local drawIdol = function(deltaTime)
     end
 end
 
---added code
 local drawRightBarAni = function(deltaTime)
-    local idolAnimTickRes = gfx.TickAnimation(RightPanelAni, deltaTime);
-    if idolAnimTickRes == 1 then
-        gfx.GlobalAlpha(idolAnimTransitionScale);
-
-            idolAnimTransitionScale = idolAnimTransitionScale + 1 / 60;
-            if (idolAnimTransitionScale > 1) then
-                idolAnimTransitionScale = 1;
-            end
-
-        local tw, th = gfx.ImageSize(RightPanelAni);
-         gfx.BeginPath();
-        gfx.ImageRect(rightPanelX + 1080 - tw, rightPanelY + 5, tw * 1,
-          th * 1, RightPanelAni, 1, 0);
-    end
+    -- badgeLines
+    gfx.BeginPath();
+    gfx.ImageRect(rightPanelX + 1080 - 531 + badgeLinesAnimOffsetX, rightPanelY + 5, 531, 85, badgeLines, 1, 0);
 end
---
 
 local drawTopBar = function()
     gfx.BeginPath();
@@ -548,6 +537,14 @@ local tickTransitions = function(deltaTime)
 
     jacketPanelX = 40 + (JACKET_PANEL_TRANSTION_ENTER_OFFSET *
                        (1 - Easing.outQuad(transitionEnterScale)))
+
+
+    if badgeLinesAnimScale < 1 then
+        badgeLinesAnimScale = badgeLinesAnimScale + deltaTime / 0.5 -- transition should last for that time in seconds
+    else
+        badgeLinesAnimScale = 0
+    end
+    badgeLinesAnimOffsetX = 16 * (1-badgeLinesAnimScale);
 end
 
 result_set = function()
diff --git a/textures/result/panels/clear gradient.png b/textures/result/badge_gradient.png
similarity index 100%
rename from textures/result/panels/clear gradient.png
rename to textures/result/badge_gradient.png
diff --git a/textures/result/clear lines.png b/textures/result/badge_lines.png
similarity index 100%
rename from textures/result/clear lines.png
rename to textures/result/badge_lines.png