From e6e4fe3c48c59c90fdd5bec84f5e524e700de0b2 Mon Sep 17 00:00:00 2001
From: Jon <audigex@gmail.com>
Date: Sun, 4 Aug 2024 17:40:11 +0100
Subject: [PATCH] Fixed Mk5 sleeper not being purchasable, re-enabled coach
 sortpurchase ordering, updated changelog

---
 docs/changelog.txt                    |  3 ++
 src/sortpurchase.pnml                 | 78 +++++++++++++--------------
 src/trains/rolling_stock/BR/Mk5a.pnml |  2 +-
 3 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index 86ec0495..0ca24c1d 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -22,6 +22,7 @@
 - Improved LNER Teak coach windows and roofs to fit scale better
 - Improved Standard 9F
 - Added Orange Freightliner livery for Class 66, Class 90
+- Started using variant groups to organise purchase list
 - Fixed some introduction and model lifespans (set is now fully freight playable from ~1850 onwards)
 - Fixed 730/0 and /2 having swapped livery options
 - Fixed some horizontal view lengths
@@ -30,6 +31,8 @@
 - Fixed steam tractive efforts (and adjusted some other stats)
 - Fixed Class 80-87 (+prototypes) sprite templates
 - Fixed 196 livery (incorrectly labelled WMR as TfW)
+- Fixed Mk4 coaches not working on unelectrified tracks
+- Fixed Mk5 sleeper being overwritten and not visible
 - Re-added sounds for trams
 - Removed Route Availability from information strings
 
diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml
index cce1ee34..8b3cac7f 100644
--- a/src/sortpurchase.pnml
+++ b/src/sortpurchase.pnml
@@ -254,49 +254,49 @@ sort(FEAT_TRAINS, [
  item_LNER_Thompson_61FK,
  item_LNER_Thompson_63TK,
  header_BRMk1,
-//  item_BRMk1FO,
-//  item_BRMk1SO,
-//  item_BRMk1TSO,
-//  item_BRMk1FK,
-//  item_BRMk1CK,
-//  item_BRMk1SK,
-//  item_BRMk1BSO,
-//  item_BRMk1BSOT,
-//  item_BRMk1BFK,
-//  item_BRMk1BCK,
-//  item_BRMk1BSK,
-//  item_BRMk1BG,
-//  item_BRMk1RK,
-//  item_BRMk1RMB,
+    item_BRMk1FO,
+    item_BRMk1SO,
+    item_BRMk1TSO,
+    item_BRMk1FK,
+    item_BRMk1CK,
+    item_BRMk1SK,
+    item_BRMk1BSO,
+    item_BRMk1BSOT,
+    item_BRMk1BFK,
+    item_BRMk1BCK,
+    item_BRMk1BSK,
+    item_BRMk1BG,
+    item_BRMk1RK,
+    item_BRMk1RMB,
  header_BRMk2,
-//  item_BRMk2_DBSO,
-//  item_BRMk2_Early_SO,
-//  item_BRMk2_Early_FO,
-//  item_BRMk2_Late_SO,
-//  item_BRMk2_Late_FO,
-//  item_BRMk2_BSO,
-//  item_BRMk2_BFO,
-//  item_BRMk2_Buffet,
+    item_BRMk2_DBSO,
+    item_BRMk2_Early_SO,
+    item_BRMk2_Early_FO,
+    item_BRMk2_Late_SO,
+    item_BRMk2_Late_FO,
+    item_BRMk2_BSO,
+    item_BRMk2_BFO,
+    item_BRMk2_Buffet,
 header_BRMk3,
-//  item_BRMk3DVT,
-//  item_253_BRMk3TF,
-//  item_253_BRMk3TS,
-//  item_253_BRMk3TGS,
-//  item_253_BRMk3TRSB,
-//  item_253_BRMk3TRUB,
-//  item_253_BRMk3TRUK,
-//  item_BRMk3Sleeper,
+    item_BRMk3DVT,
+    item_253_BRMk3TF,
+    item_253_BRMk3TS,
+    item_253_BRMk3TGS,
+    item_253_BRMk3TRSB,
+    item_253_BRMk3TRUB,
+    item_253_BRMk3TRUK,
+    item_BRMk3Sleeper,
 header_BRMk4,
-//  item_BRMk4DVT,
-//  item_91_BRMk4FO,
-//  item_91_BRMk4TSOE,
-//  item_91_BRMk4TSO,
-//  item_91_BRMk4RFM,
-//  item_91_BRMk4TSOD,
+    item_BRMk4DVT,
+    item_91_BRMk4FO,
+    item_91_BRMk4TSOE,
+    item_91_BRMk4TSO,
+    item_91_BRMk4RFM,
+    item_91_BRMk4TSOD,
  header_BRMk5,
-//  item_BRMk5a,
-//  item_BRMk5DVT,
-//  item_BRMk5Sleeper,
+    item_BRMk5DVT,
+    item_BRMk5a,
+    item_BRMk5Sleeper,
  item_BR438_3,
  item_BR438_4,
  item_EyeCandy,
diff --git a/src/trains/rolling_stock/BR/Mk5a.pnml b/src/trains/rolling_stock/BR/Mk5a.pnml
index a1b25396..cb426ea3 100644
--- a/src/trains/rolling_stock/BR/Mk5a.pnml
+++ b/src/trains/rolling_stock/BR/Mk5a.pnml
@@ -2,7 +2,7 @@ spriteset(spriteset_BRMk5a_purchase, "gfx/Rolling Stock/Mk5a.png") {
 	template_purchase(88, 0)
 }
 
-item (FEAT_TRAINS, item_BRMk5a, 545) {
+item (FEAT_TRAINS, item_BRMk5a, 597) {
 	property {
 		variant_group:					header_BRMk5;
 		name: 							string(STR_NAME_BRMk5a);