From 2b3e0f114f9f404e7d3ffb58a813714e1352e2a5 Mon Sep 17 00:00:00 2001
From: "Ryan P. McKinnon" <15917743+mrhoribu@users.noreply.github.com>
Date: Tue, 10 Dec 2024 13:20:35 -0500
Subject: [PATCH 1/3] chore: sync up with EO\lich5 and EO\scripts rubocop

---
 .rubocop.yml | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 59ef2297d7..6b37052613 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,29 +1,35 @@
 AllCops:
-  TargetRubyVersion: 3.2
+  TargetRubyVersion: 3.3
   NewCops: disable
   Include:
     - '**/*.lic'
     - '**/*.rb'
 
-Naming/FileName:
+Naming:
   Enabled: false
-  
-Naming/AccessorMethodName:
-   Enabled: false
 
-Naming/PredicateName:
+Style:
   Enabled: false
 
-Style:
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+
+Layout/EndOfLine:
   Enabled: false
 
+Layout/FirstHashElementIndentation:
+  EnforcedStyle: consistent
+
 Layout/HashAlignment:
   EnforcedHashRocketStyle: table
 
-Layout/EndOfLine:
+Layout/LineLength:
   Enabled: false
 
-Layout/LineLength:
+Layout/HeredocIndentation:
+  Enabled: false
+
+Layout/ClosingHeredocIndentation:
   Enabled: false
 
 Metrics/AbcSize:
@@ -52,3 +58,9 @@ Metrics/PerceivedComplexity:
 
 Metrics/ParameterLists:
   Enabled: false
+
+Security/Eval:
+  Enabled: false
+  
+Security/MarshalLoad:
+  Enabled: false

From e824281bada032836ff770b39572a28e67b3c506 Mon Sep 17 00:00:00 2001
From: "Ryan P. McKinnon" <15917743+mrhoribu@users.noreply.github.com>
Date: Tue, 10 Dec 2024 13:36:55 -0500
Subject: [PATCH 2/3] alphabatize list

---
 .rubocop.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 6b37052613..003cb2be36 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,14 +1,12 @@
 AllCops:
+  SuggestExtensions: false
   TargetRubyVersion: 3.3
   NewCops: disable
   Include:
     - '**/*.lic'
     - '**/*.rb'
 
-Naming:
-  Enabled: false
-
-Style:
+Layout/ClosingHeredocIndentation:
   Enabled: false
 
 Layout/EmptyLineAfterGuardClause:
@@ -23,13 +21,10 @@ Layout/FirstHashElementIndentation:
 Layout/HashAlignment:
   EnforcedHashRocketStyle: table
 
-Layout/LineLength:
-  Enabled: false
-
 Layout/HeredocIndentation:
   Enabled: false
 
-Layout/ClosingHeredocIndentation:
+Layout/LineLength:
   Enabled: false
 
 Metrics/AbcSize:
@@ -55,12 +50,18 @@ Metrics/ModuleLength:
 
 Metrics/PerceivedComplexity:
   Enabled: false
-
+  
 Metrics/ParameterLists:
   Enabled: false
 
+Naming:
+  Enabled: false
+
 Security/Eval:
   Enabled: false
   
 Security/MarshalLoad:
   Enabled: false
+
+Style:
+  Enabled: false

From 5f9c1c16bf25ba9bc7b878b3e5c558933a3d6320 Mon Sep 17 00:00:00 2001
From: Mahtra <93822896+MahtraDR@users.noreply.github.com>
Date: Wed, 11 Dec 2024 11:53:14 +1300
Subject: [PATCH 3/3] [scripts][train] Allow for fang_cove_override_town

---
 train.lic | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/train.lic b/train.lic
index c3f51aba04..ede806c90a 100644
--- a/train.lic
+++ b/train.lic
@@ -119,7 +119,8 @@ class CrossingTrain
 
   def setup
     @settings = get_settings
-    hometown_data = get_data('town')[@settings.hometown]
+    hometown = @settings.fang_cove_override_town || @settings.hometown
+    hometown_data = get_data('town')[hometown]
 
     current_stats = {
       'strength'     => DRStats.strength,