From 5de6fcc7ad080c4a2a96bd70384763c3c0439eae Mon Sep 17 00:00:00 2001
From: Brian Sperlongano <zelonewolf@gmail.com>
Date: Sat, 18 May 2024 20:52:19 -0400
Subject: [PATCH 1/2] Refactor GLCT

---
 src/js/shield_defs.js | 45 +++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
index 4cd44e443..b868bc0c9 100644
--- a/src/js/shield_defs.js
+++ b/src/js/shield_defs.js
@@ -105,6 +105,21 @@ export function loadShields() {
   // NORTH AMERICA
   shields["GLCT"] = {
     notext: true,
+    overrideByRef: {
+      LECT: {
+        spriteBlank: "shield_glct_lect",
+      },
+      LHCT: {
+        spriteBlank: "shield_glct_lhct",
+      },
+      LMCT: {
+        spriteBlank: "shield_glct_lmct",
+        colorLighten: Color.shields.green,
+      },
+      LSCT: {
+        spriteBlank: "shield_glct_lsct",
+      },
+    }
   };
   shields["GLCT:Loop"] = banneredShield(
     shields["GLCT"],
@@ -112,6 +127,13 @@ export function loadShields() {
     Color.shields.brown
   );
 
+  shields["GLCT:Loop"].overrideByRef = {
+    LMCT: {
+      spriteBlank: "shield_glct_lmct",
+      colorLighten: Color.shields.brown,
+    },
+  };
+
   // Canada
   shields["CA:transcanada"] = {
     spriteBlank: ["shield_ca_tch_2", "shield_ca_tch_3"],
@@ -3890,29 +3912,6 @@ export function loadShields() {
     "Westpark Tollway": "WPT",
   };
 
-  shields["GLCT"].overrideByRef = {
-    LECT: {
-      spriteBlank: "shield_glct_lect",
-    },
-    LHCT: {
-      spriteBlank: "shield_glct_lhct",
-    },
-    LMCT: {
-      spriteBlank: "shield_glct_lmct",
-      colorLighten: Color.shields.green,
-    },
-    LSCT: {
-      spriteBlank: "shield_glct_lsct",
-    },
-  };
-
-  shields["GLCT:Loop"].overrideByRef = {
-    LMCT: {
-      spriteBlank: "shield_glct_lmct",
-      colorLighten: Color.shields.brown,
-    },
-  };
-
   return {
     networks: shields,
     options: {

From 0f4545fae73b2d0a72b8c9a8bb00a167cfcebe05 Mon Sep 17 00:00:00 2001
From: Brian Sperlongano <zelonewolf@gmail.com>
Date: Sat, 18 May 2024 20:54:07 -0400
Subject: [PATCH 2/2] Prettier

---
 src/js/shield_defs.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
index b868bc0c9..5872036ee 100644
--- a/src/js/shield_defs.js
+++ b/src/js/shield_defs.js
@@ -119,7 +119,7 @@ export function loadShields() {
       LSCT: {
         spriteBlank: "shield_glct_lsct",
       },
-    }
+    },
   };
   shields["GLCT:Loop"] = banneredShield(
     shields["GLCT"],