Merge pull request #31 from derail-valley-modding/b97

Build 98 Compatibility
derail-valley-modding · Feb 9, 2024 · 0c9a9b2 · 0c9a9b2
2 parents 9235a07 + b6cd059
commit 0c9a9b2
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 4 deletions.
diff --git a/SMShared/Constants.cs b/SMShared/Constants.cs
@@ -6,7 +6,7 @@ public static class Constants
     {
         public const string MOD_ID = "SkinManagerMod";
         public const string MOD_NAME = "Skin Manager";
-        public const string MOD_VERSION = "3.1.2";
+        public const string MOD_VERSION = "3.4.0";
 
         public const string SKIN_FOLDER_NAME = "Skins";
         public const string EXPORT_FOLDER_NAME = "Exported";
@@ -40,6 +40,7 @@ public static bool IsSkinConfigFile(string filename)
             "LocoDE6",
             "LocoDH4",
             "LocoDM3",
+            "LocoMicroshunter",
             "LocoS282A",
             "LocoS282B",
             "LocoS060",

diff --git a/SkinConfigurator/tex_names.json b/SkinConfigurator/tex_names.json
@@ -382,6 +382,37 @@
     "TT_MetalTrim_01s.png",
     "window_d.png"
   ],
+  "LocoMicroshunter": [
+    "Labels_d.png",
+    "Labels_s.png",
+    "Lamps_02d.png",
+    "Lamps_02e.png",
+    "Lamps_02n.png",
+    "Lamps_02s.png",
+    "LocoDE2_Gauges_01d.png",
+    "LocoDE2_Gauges_01e.png",
+    "LocoMicroshunter_Body_01d.png",
+    "LocoMicroshunter_Body_01n.png",
+    "LocoMicroshunter_Body_01s.png",
+    "LocoMicroshunter_Gauges_01d.png",
+    "LocoMicroshunter_Gauges_01e.png",
+    "LocoMicroshunter_Interior_01d.png",
+    "LocoMicroshunter_Interior_01n.png",
+    "LocoMicroshunter_Interior_01s.png",
+    "MB_paint_02d_red.png",
+    "MaskForShader.png",
+    "NotoSans-Regular__MAIN__LFS Atlas.png",
+    "TT_MetalTrim_01d.png",
+    "TT_MetalTrim_01n.png",
+    "TT_MetalTrim_01s.png",
+    "TrainCarAccessories_d.png",
+    "TrainCarAccessories_n.png",
+    "TrainCarAccessories_s.png",
+    "headlights_01d.png",
+    "headlights_01n.png",
+    "headlights_01s.png",
+    "window_d.png"
+  ],
   "LocoS060": [
     "Ember_01d.png",
     "Ember_01e.png",

diff --git a/SkinManagerMod/SkinManagerMod.csproj b/SkinManagerMod/SkinManagerMod.csproj
@@ -55,6 +55,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
+    <Reference Include="Unity.TextMeshPro" />
     <Reference Include="UnityEngine">
       <HintPath>D:\Games\SteamLibrary\steamapps\common\Derail Valley\DerailValley_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>

diff --git a/SkinManagerMod/SkinProvider.cs b/SkinManagerMod/SkinProvider.cs
@@ -47,6 +47,18 @@ private static void UnloadSkin(string liveryId, string skinName)
 
         #region Provider Methods
 
+        public static SkinGroup GetSkinGroup(TrainCarLivery livery)
+        {
+            if (skinGroups.TryGetValue(livery.id, out SkinGroup group))
+            {
+                return group;
+            }
+
+            var newGroup = new SkinGroup(livery);
+            skinGroups[livery.id] = newGroup;
+            return newGroup;
+        }
+
         public static Skin GetDefaultSkin(string carId)
         {
             if (defaultSkins.TryGetValue(carId, out Skin existing))
@@ -157,8 +169,6 @@ public static bool Initialize()
             {
                 var defaultSkin = CreateDefaultSkin(livery);
                 defaultSkins.Add(livery.id, defaultSkin);
-
-                skinGroups[livery.id] = new SkinGroup(livery);
             }
 
             ReloadAllSkins();
@@ -472,7 +482,7 @@ internal static void BeginLoadSkin(SkinConfig config, bool forceSync = false)
             config.Skin = skin;
 
             // find correct group, remove existing skin
-            var skinGroup = skinGroups[config.Livery.id];
+            var skinGroup = GetSkinGroup(config.Livery);
             if (skinGroup.Skins.Find(s => s.Name == config.Name) is Skin existingSkin)
             {
                 skinGroup.Skins.Remove(existingSkin);