Fix generating the SpawnAssets file for the map sometimes with weights (chances) of items different from original spawn asset

Author: RestoreMonarchy

SpawnsManager/Models/SpawnItemInfo.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Xml.Serialization;
 
 namespace RestoreMonarchy.SpawnsManager.Models
 {
@@ -7,5 +8,8 @@ public class SpawnItemInfo
         public ushort AssetId { get; set; }   
         public string Name { get; set; }
         public int Weight { get; set; }
+
+        [XmlIgnore]
+        public decimal Chance { get; set; }
     }
 }

SpawnsManager/SpawnsManager.csproj

@@ -4,10 +4,10 @@
 		<TargetFramework>net48</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<RootNamespace>RestoreMonarchy.SpawnsManager</RootNamespace>
-		<Version>1.0.1</Version>
+		<Version>1.0.2</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="RestoreMonarchy.RocketRedist" Version="3.24.4" ExcludeAssets="runtime" />
+	  <PackageReference Include="RestoreMonarchy.RocketRedist" Version="3.25.5" ExcludeAssets="runtime" />
 	</ItemGroup>
 </Project>

SpawnsManager/SpawnsManagerPlugin.Assets.cs

@@ -1,7 +1,9 @@
 using RestoreMonarchy.SpawnsManager.Helpers;
 using RestoreMonarchy.SpawnsManager.Models;
 using SDG.Unturned;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace RestoreMonarchy.SpawnsManager
 {
@@ -55,35 +57,42 @@ private void AddAndOverrideSpawnAssets()
             LogDebug($"{SpawnAssetsConfiguration.SpawnAssets.Length} spawn assets have been added or overriden!");
         }
 
-        public List<SpawnItemInfo> GetSpawnItems(SpawnAsset spawnAsset, EAssetType assetType, int num = 0)
+        public List<SpawnItemInfo> GetSpawnItems(SpawnAsset spawnAsset, EAssetType assetType, List<SpawnItemInfo> spawnItems = null, int depth = 0, decimal chance = 1)
         {
-            List<SpawnItemInfo> spawnItems = new();
+            bool isFirstDepth = depth == 0;
+            if (spawnItems == null)
+            {
+                spawnItems = new List<SpawnItemInfo>();
+            }
 
-            if (num++ > 32)
+            if (depth > 32)
             {
                 return spawnItems;
             }
 
+            decimal sumWeight = spawnAsset.tables.Sum(x => x.weight);
             foreach (SpawnTable spawnTable in spawnAsset.tables)
             {
                 Asset asset = spawnTable.FindAsset(assetType);
-
                 if (asset == null)
                 {
-                    return [];
+                    continue;
                 }
 
+                decimal spawnChance = spawnTable.weight / sumWeight * chance;
+
                 if (asset is SpawnAsset spawnAsset2)
                 {
-                    spawnItems.AddRange(GetSpawnItems(spawnAsset2, assetType, num));
+                    depth++;
+                    GetSpawnItems(spawnAsset2, assetType, spawnItems, depth, spawnChance);
                 }
                 else if (asset is ItemAsset itemAsset)
                 {
                     spawnItems.Add(new SpawnItemInfo()
                     {
                         AssetId = itemAsset.id,
                         Name = itemAsset.itemName,
-                        Weight = spawnTable.weight
+                        Chance = spawnChance
                     });
                 }
                 else if (asset is VehicleAsset vehicleAsset)
@@ -92,7 +101,7 @@ public List<SpawnItemInfo> GetSpawnItems(SpawnAsset spawnAsset, EAssetType asset
                     {
                         AssetId = vehicleAsset.id,
                         Name = vehicleAsset.vehicleName,
-                        Weight = spawnTable.weight
+                        Chance = spawnChance
                     });
                 }
                 else if (asset is VehicleRedirectorAsset vehicleRedirectorAsset)
@@ -101,7 +110,7 @@ public List<SpawnItemInfo> GetSpawnItems(SpawnAsset spawnAsset, EAssetType asset
                     {
                         AssetId = vehicleRedirectorAsset.id,
                         Name = vehicleRedirectorAsset.FriendlyName,
-                        Weight = spawnTable.weight
+                        Chance = spawnChance
                     });
                 }
                 else if (asset is AnimalAsset animalAsset)
@@ -110,7 +119,7 @@ public List<SpawnItemInfo> GetSpawnItems(SpawnAsset spawnAsset, EAssetType asset
                     {
                         AssetId = animalAsset.id,
                         Name = animalAsset.animalName,
-                        Weight = spawnTable.weight
+                        Chance = spawnChance
                     });
                 }
                 else
@@ -119,6 +128,28 @@ public List<SpawnItemInfo> GetSpawnItems(SpawnAsset spawnAsset, EAssetType asset
                 }
             }
 
+            if (isFirstDepth)
+            {
+                // aggregate spawn items by AssetId
+                spawnItems = spawnItems
+                    .GroupBy(x => x.AssetId)
+                    .Select(g => new SpawnItemInfo
+                    {
+                        AssetId = g.Key,
+                        Name = g.First().Name,
+                        Chance = g.Sum(x => x.Chance)
+                    })
+                    .ToList();
+
+                // calculate weights
+                int totalWeight = 10000;
+                foreach (SpawnItemInfo spawnItem in spawnItems)
+                {
+                    spawnItem.Weight = Math.Max(1, (int)(spawnItem.Chance * totalWeight));
+                }
+                spawnItems = spawnItems.OrderByDescending(x => x.Weight).ToList();
+            }
+
             return spawnItems;
         }
     }