Merge branch 'main' into TU43

This commit is contained in:
Fireblade
2026-05-24 23:47:12 -04:00
committed by GitHub
78 changed files with 1648 additions and 572 deletions

View File

@@ -628,6 +628,8 @@ static std::string WorldSizeToPropertyValue(int worldSize)
return "medium";
case e_worldSize_Large:
return "large";
case e_worldSize_Expanded:
return "expanded";
case e_worldSize_Classic:
default:
return "classic";
@@ -644,6 +646,8 @@ static int WorldSizeToXzChunks(int worldSize)
return LEVEL_WIDTH_MEDIUM;
case e_worldSize_Large:
return LEVEL_WIDTH_LARGE;
case e_worldSize_Expanded:
return LEVEL_WIDTH_EXPANDED;
case e_worldSize_Classic:
default:
return LEVEL_WIDTH_CLASSIC;
@@ -659,6 +663,7 @@ static int WorldSizeToHellScale(int worldSize)
case e_worldSize_Medium:
return HELL_LEVEL_SCALE_MEDIUM;
case e_worldSize_Large:
case e_worldSize_Expanded:
return HELL_LEVEL_SCALE_LARGE;
case e_worldSize_Classic:
default:
@@ -694,6 +699,12 @@ static bool TryParseWorldSize(const std::string &lowered, int *outWorldSize)
return true;
}
if (lowered == "expanded" || lowered == "344" || lowered == "8")
{
*outWorldSize = e_worldSize_Expanded;
return true;
}
return false;
}