implement random spawning prevention

derail-valley-modding · Jan 23, 2025 · e0a99bc · e0a99bc
1 parent 8c12193
commit e0a99bc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/SkinConfigurator/ViewModels/ThemeConfigModel.cs b/SkinConfigurator/ViewModels/ThemeConfigModel.cs
@@ -191,6 +191,7 @@ public ThemeConfigItem JsonModel()
             {
                 Name = ThemeName,
                 HideFromStores = HideFromStores,
+                PreventRandomSpawning = PreventRandomSpawning,
             };
 
             if (HasValidImage)

diff --git a/SkinManagerMod/SkinProvider.cs b/SkinManagerMod/SkinProvider.cs
@@ -307,18 +307,29 @@ public static string GetNewSkin(TrainCarLivery carType)
                     (Main.Settings.defaultSkinsMode == DefaultSkinsMode.AllowForAllCars);
                 // || (CustomCarTypes.ContainsKey(carType) && (Main.Settings.defaultSkinsMode == SkinManagerSettings.DefaultSkinsMode.AllowForCustomCars));
 
-                int nChoices = allowRandomDefault ? group.Skins.Count + 1 : group.Skins.Count;
+                var allowedRandom = group.Skins.Where(AllowRandomSpawning).ToList();
+                int nChoices = allowRandomDefault ? allowedRandom.Count + 1 : allowedRandom.Count;
+
                 int choice = UnityEngine.Random.Range(0, nChoices);
-                if (choice < group.Skins.Count)
+                if (choice < allowedRandom.Count)
                 {
-                    return group.Skins[choice].Name;
+                    return allowedRandom[choice].Name;
                 }
             }
 
             // fall back to default skin
             return DefaultThemeName;
         }
 
+        private static bool AllowRandomSpawning(Skin skin)
+        {
+            if (TryGetThemeSettings(skin.Name, out var settings))
+            {
+                return !settings.PreventRandomSpawning;
+            }
+            return true;
+        }
+
         #endregion
 
         //====================================================================================================

diff --git a/SkinManagerMod/ThemeSettings.cs b/SkinManagerMod/ThemeSettings.cs
@@ -10,6 +10,7 @@ public class ThemeSettings
         public readonly string ThemeName;
         public Version HighestVersion;
         public bool HideFromStores;
+        public bool PreventRandomSpawning;
 
         public SkinTexture CanLabel;
         public Color? LabelBaseColor;
@@ -49,6 +50,7 @@ public static ThemeSettings Create(string basePath, ThemeConfigItem data, Versio
             var result = new ThemeSettings(data.Name, version)
             {
                 HideFromStores = data.HideFromStores,
+                PreventRandomSpawning = data.PreventRandomSpawning,
             };
 
             TryParseColor(data.LabelBaseColor, basePath, ref result.LabelBaseColor);