Gaming/blizzless-diiis
Gaming/blizzless-diiis
3
0
Fork 1
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

World generation cleanup

Browse Source
This commit is contained in:
Lucca Faria Ferri 2023-02-09 21:44:45 -08:00
parent 1e80bb2084
commit 0f807d56b0
1 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/DiIiS-NA/D3-GameServer/GSSystem/GeneratorsSystem/WorldGenerator.cs
View File

@ -1651,12 +1651,11 @@ namespace DiIiS_NA.GameServer.GSSystem.GeneratorsSystem
Logger.Debug("Generating random world: {0}", worldSNO);
//Each DRLGParam is a level
if ((worldData.DRLGParams != null) && (worldData.DRLGParams.Count > 0))
for (int paramIndex = 0; paramIndex < worldData.DRLGParams.Count; paramIndex++)
if ((worldData.DRLGParams == null) || (worldData.DRLGParams.Count <= 0)) return true;
foreach (var drlgParam in worldData.DRLGParams)
{
var drlgparam = worldData.DRLGParams[paramIndex];
//Logger.Debug("DRLGParams: LevelArea: {0}", drlgparam.LevelArea);
foreach (var tile in drlgparam.Tiles)
foreach (var tile in drlgParam.Tiles)
{
Logger.Trace("RandomGeneration: TileType: {0}", (TileTypes)tile.TileType);
tiles.Add(tile.SNOScene, tile);
@ -1687,34 +1686,36 @@ namespace DiIiS_NA.GameServer.GSSystem.GeneratorsSystem
{
if (cell != -1)
{
Vector3D TilePosition = new Vector3D(drlgparam.ChunkSize * (coordY + 1), drlgparam.ChunkSize * (coordX + 1), 0);
Vector3D tilePosition = new Vector3D(drlgParam.ChunkSize * (coordY + 1),
drlgParam.ChunkSize * (coordX + 1), 0);
if (coordX == world_layout.enterPositionX && coordY == world_layout.enterPositionY)
{
if (cell <= 115)
worldTiles.Add(TilePosition, GetTileInfo(tiles, TileTypes.Entrance, cell));
else
worldTiles.Add(TilePosition, GetTile(tiles, cell));
worldTiles.Add(tilePosition,
cell <= 115
? GetTileInfo(tiles, TileTypes.Entrance, cell)
: GetTile(tiles, cell));
}
else
if (coordX == world_layout.exitPositionX && coordY == world_layout.exitPositionY)
else if (coordX == world_layout.exitPositionX &&
coordY == world_layout.exitPositionY)
{
if (cell <= 115)
worldTiles.Add(TilePosition, GetTileInfo(tiles, TileTypes.Exit, cell));
else
worldTiles.Add(TilePosition, GetTile(tiles, cell));
worldTiles.Add(tilePosition,
cell <= 115
? GetTileInfo(tiles, TileTypes.Exit, cell)
: GetTile(tiles, cell));
}
else
{
if (cell <= 115)
worldTiles.Add(TilePosition, GetTileInfo(tiles, TileTypes.Normal, cell));
else
worldTiles.Add(TilePosition, GetTile(tiles, cell));
worldTiles.Add(tilePosition,
cell <= 115
? GetTileInfo(tiles, TileTypes.Normal, cell)
: GetTile(tiles, cell));
}
}
coordX++;
}
coordY++;
}
}
@ -1722,8 +1723,8 @@ namespace DiIiS_NA.GameServer.GSSystem.GeneratorsSystem
{
Vector3D initialStartTilePosition = new Vector3D(480, 480, 0);
worldTiles.Add(initialStartTilePosition, entrance);
AddAdjacentTiles(worldTiles, entrance, drlgparam.ChunkSize, tiles, 0, initialStartTilePosition);
AddFillers(worldTiles, tiles, drlgparam.ChunkSize);
AddAdjacentTiles(worldTiles, entrance, drlgParam.ChunkSize, tiles, 0, initialStartTilePosition);
AddFillers(worldTiles, tiles, drlgParam.ChunkSize);
}
foreach (var tile in worldTiles)
@ -1732,13 +1733,13 @@ namespace DiIiS_NA.GameServer.GSSystem.GeneratorsSystem
}
//AddFiller
Logger.Debug("RandomGeneration: LevelArea: {0}", drlgparam.LevelArea);
Logger.Debug("RandomGeneration: LevelArea: {0}", drlgParam.LevelArea);
foreach (var chunk in worldData.SceneParams.SceneChunks)
{
if (drlgparam.LevelArea != -1)
if (drlgParam.LevelArea != -1)
{
chunk.SceneSpecification.SNOLevelAreas[0] = drlgparam.LevelArea;
chunk.SceneSpecification.SNOWeather = drlgparam.Weather;
chunk.SceneSpecification.SNOLevelAreas[0] = drlgParam.LevelArea;
chunk.SceneSpecification.SNOWeather = drlgParam.Weather;
}
if (worldSNO == WorldSno.x1_bog_01) //A5 marsh
{
@ -1746,7 +1747,6 @@ namespace DiIiS_NA.GameServer.GSSystem.GeneratorsSystem
chunk.SceneSpecification.SNOLevelAreas[0] = 258142;
}
}
//ProcessCommands(drlgparam, worldData, paramIndex);
}
//Coordinates are added after selection of tiles and map
//Leave it for Defiler Crypt debugging