Automatic level numbers for multiplayer

MBU-Team · Mar 26, 2024 · 24fb302 · 24fb302
1 parent 7dc07e0
commit 24fb302
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/game/marble/data/gameMissionInfo.cs b/game/marble/data/gameMissionInfo.cs
@@ -837,14 +837,14 @@ function buildMissionList()
       }
 
       sortByLevel( SinglePlayMissionGroup );
-      sortByLevel( CustomSinglePlayMissionGroup );
-      sortByLevel( MultiPlayMissionGroup );
+      sortByLevel( CustomSinglePlayMissionGroup, true );
+      sortByLevel( MultiPlayMissionGroup, true );
       sortByLevel( SpecialMissionGroup );
       // hack, do this twice to get things into the proper order, don't have time to figure out why a 
       // single sort doesn't work
       sortByLevel( SinglePlayMissionGroup );
-      sortByLevel( CustomSinglePlayMissionGroup );
-      sortByLevel( MultiPlayMissionGroup );
+      sortByLevel( CustomSinglePlayMissionGroup, true );
+      sortByLevel( MultiPlayMissionGroup, true );
       sortByLevel( SpecialMissionGroup );
 
       // verify that level Ids are unique
@@ -884,12 +884,12 @@ function buildMissionList()
       for (%i = 0; %i < MultiPlayMissionGroup.getCount(); %i++)
       {
          %mis = MultiPlayMissionGroup.getObject(%i);
-         if (%levelIds[%mis.level] !$= "")
-         {
-            GameMissionInfo.dupErrors = GameMissionInfo.dupErrors @ "duplicate mission Id for level:" SPC %mis.file @ "\n";
-            GameMissionInfo.dupLevelIds[%mis.level] = true;
-         }
-         %levelIds[%mis.level] = true;
+         //if (%levelIds[%mis.level] !$= "")
+         //{
+            //GameMissionInfo.dupErrors = GameMissionInfo.dupErrors @ "duplicate mission Id for level:" SPC %mis.file @ "\n";
+            //GameMissionInfo.dupLevelIds[%mis.level] = true;
+         //}
+         //%levelIds[%mis.level] = true;
          if (%mis.guid !$= "")
          {
             if (%guids[%mis.guid] !$= "")
@@ -931,8 +931,10 @@ function isDemoMission( %level )
    //return 0;
 }
 
-function sortByLevel(%grp)
+function sortByLevel(%grp, %useLevelNum)
 {
+   if (%useLevelNum $= "")
+      %useLevelNum = false;
    %grp.numAddedMissions = 0;
    %newLevelNum = 0;
    %ngrp = new SimGroup();
@@ -976,7 +978,7 @@ function sortByLevel(%grp)
       //{
          %grp.numAddedMissions++;
          %obj = %ngrp.getObject(%lowestIndex);
-         if (%obj.difficultySet $= "custom")
+         if (%useLevelNum)
             %obj.level = %newLevelNum;
          %grp.add(%obj);
       //}