From a95e07df96fb50a92190c8a27e2a62a08ed38f3c Mon Sep 17 00:00:00 2001
From: Jane Petrovna <jane@j4.pm>
Date: Wed, 26 May 2021 11:01:34 -0400
Subject: [PATCH] asdasdasdasdasd

---
 lights.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lights.js b/lights.js
index 82fcf98..692e00b 100644
--- a/lights.js
+++ b/lights.js
@@ -84,23 +84,23 @@ function fade(index) {
   var current_tick_r = Math.abs(Math.floor((diff_cr / diff_r) * fade_ticks));
   var current_tick_g = Math.abs(Math.floor((diff_cg / diff_g) * fade_ticks));
   var current_tick_b = Math.abs(Math.floor((diff_cb / diff_b) * fade_ticks));
-  if (diff_r == 0) {
-    current_tick_r = fade_ticks;
-  } else if (Math.abs(current.r + interval_r) >= Math.abs(final.r)) {
+  if (diff_r == 0 ||
+    Math.abs(current.r + interval_r) >= Math.abs(final.r) ||
+    current_tick_r + 1 >= fade_ticks) {
     current.r = final.r;
     interval_r = 0;
     current_tick_r = fade_ticks;
   }
-  if (diff_g == 0) {
-    current_tick_g = fade_ticks;
-  } else if (Math.abs(current.g + interval_g) >= Math.abs(final.g)) {
+  if (diff_g == 0 ||
+    Math.abs(current.g + interval_g) >= Math.abs(final.g) ||
+    current_tick_g + 1 >= fade_ticks) {
     current.g = final.g;
     interval_g = 0;
     current_tick_g = fade_ticks;
   }
-  if (diff_b == 0) {
-    current_tick_b = fade_ticks;
-  } else if (Math.abs(current.b + interval_b) >= Math.abs(final.b)) {
+  if (diff_b == 0 ||
+    Math.abs(current.b + interval_b) >= Math.abs(final.b) ||
+    current_tick_b + 1 >= fade_ticks) {
     current.b = final.b;
     interval_b = 0;
     current_tick_b = fade_ticks;