Fixed map randomization and semantic versioning

Author: DigiWorm0

LevelImposter/Builders/IElemBuilder.cs

@@ -10,7 +10,7 @@ namespace LevelImposter.Builders;
 public interface IElemBuilder
 {
     /// <summary>
-    ///     Parses and builds a GameObject based on <c>LIElement</c> data.
+    ///     First step in the build process, called before <see cref="OnBuild"/> for each element in the map.
     /// </summary>
     /// <param name="elem">Element to be parsed and built</param>
     /// <param name="obj">GameObject to append data and components to</param>
@@ -19,7 +19,7 @@ public void OnPreBuild(LIElement elem, GameObject obj)
     }
 
     /// <summary>
-    ///     Parses and builds a GameObject based on <c>LIElement</c> data.
+    ///     Primary step in the build process, called for each element in the map.
     /// </summary>
     /// <param name="elem">Element to be parsed and built</param>
     /// <param name="obj">GameObject to append data and components to</param>
@@ -28,7 +28,7 @@ public void OnBuild(LIElement elem, GameObject obj)
     }
 
     /// <summary>
-    ///     Final clean-up after an element has been built.
+    ///     Third step in the build process, called after <see cref="OnBuild"/> for each element in the map.
     /// </summary>
     /// <param name="elem">Element to be parsed and built</param>
     /// <param name="obj">GameObject to append data and components to</param>
@@ -38,6 +38,7 @@ public void OnPostBuild(LIElement elem, GameObject obj)
 
     /// <summary>
     ///     Final clean-up after all elements in a map have been built.
+    ///     Only called once per map build.
     /// </summary>
     public void OnCleanup()
     {

LevelImposter/C:/Program Files (x86)/Steam/steamapps/common/Among Us/BepInEx/plugins/LevelImposter.dll

@@ -0,0 +1 @@
+/workspaces/LevelImposter/LevelImposter/bin/Debug/net6.0/LevelImposter.dll

LevelImposter/Core/Utils/Stores/FileStore.cs

@@ -26,7 +26,7 @@ public byte[] Peek(int count)
     {
         using var stream = OpenStream();
         var managedArray = new byte[count];
-        stream.Read(managedArray, 0, (int)Math.Min(count, stream.Length));
+        stream.Read(managedArray, 0, count);
         return managedArray;
     }
 

LevelImposter/LevelImposter.csproj

@@ -2,6 +2,7 @@
     <PropertyGroup>
         <Title>LevelImposter</Title>
         <Version>0.21.3-dev2</Version>
+        <SourceRevisionId></SourceRevisionId>
         <Description>Custom Among Us Mapping Studio</Description>
         <Authors>DigiWorm</Authors>
 

LevelImposter/Shop/Util/MapRandomizer.cs

@@ -74,29 +74,34 @@ public static void RandomizeMap(bool setMapType = true)
         var fileIDs = new List<string>(MapFileAPI.ListIDs());
         var mapIDs = fileIDs.FindAll(id => !blacklistMaps.Contains(id));
         if (mapIDs.Count <= 0)
-            return null;    // <-- No valid maps found
+            return null;    // <-- No valid maps left
 
         // Get map weights
         var mapWeights = new float[mapIDs.Count];
-        float mapWeightSum = 0;
+        var sumOfAllMapWeights = 0.0f;
         for (var i = 0; i < mapIDs.Count; i++)
         {
             var mapWeight = ConfigAPI.GetMapWeight(mapIDs[i]);
-            mapWeights[i] = mapWeightSum + mapWeight;
-            mapWeightSum += mapWeight;
+            mapWeights[i] = sumOfAllMapWeights + mapWeight;
+            sumOfAllMapWeights += mapWeight;
         }
 
+        // All maps are of zero weight
+        if (sumOfAllMapWeights <= 0)
+            return null;
+
         // Choose a random map
-        // TODO: FIX ME, this logic is flawed and does not properly account for weights
-        var randomValue = Random.Range(0, mapWeightSum);
+        var randomValue = Random.Range(0, sumOfAllMapWeights);
+        var remainingWeight = sumOfAllMapWeights;
         for (var i = 0; i < mapIDs.Count; i++)
         {
             // Check weight
-            var mapID = mapIDs[i];
-            if (mapWeights[i] < randomValue)
+            remainingWeight -= mapWeights[i];
+            if (remainingWeight > 0)
                 continue;
 
             // Check if map is in workshop
+            var mapID = mapIDs[i];
             var isInWorkshop = Guid.TryParse(mapID, out _);
             if (isInWorkshop)
                 return mapID;

build.cake

@@ -1,27 +1,18 @@
 var target = Argument("target", "Build");
 
 var workflow = BuildSystem.GitHubActions.Environment.Workflow;
-var buildId = workflow.RunNumber;
-var tag = workflow.RefType == GitHubActionsRefType.Tag ? workflow.RefName.Substring(1) : null;
 
-Task("Build")
-    .Does(() =>
+Task("Build").Does(() =>
 {
     var settings = new DotNetBuildSettings
     {
         Configuration = "Release",
         MSBuildSettings = new DotNetMSBuildSettings()
+        {
+            VersionSuffix = "ci." + workflow.RunNumber
+        }
     };
 
-    if (tag != null) 
-    {
-        settings.MSBuildSettings.Version = tag;
-    }
-    else if (buildId != 0)
-    {
-        settings.MSBuildSettings.VersionSuffix = "ci." + buildId;
-    }
-
     DotNetBuild(".", settings);
 });