Skip to content

Removed terrainOccupied and DF location checks for type 0 locations #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
drcarademono wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Removed terrainOccupied and DF location checks for type 0 locations #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions Scripts/LocationLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,14 +451,14 @@ void OnTerrainPromoted(DaggerfallTerrain daggerTerrain, TerrainData terrainData)
{
string context = $"location=\"{loc.name}\"";

if (daggerTerrain.MapData.hasLocation)
{
if (loc.type == 0)
{
Debug.LogWarning($"Location already present at ({daggerTerrain.MapPixelX}, {daggerTerrain.MapPixelY}) ({context})");
continue;
}
}
//if (daggerTerrain.MapData.hasLocation)
//{
// if (loc.type == 0)
// {
// Debug.LogWarning($"Location already present at ({daggerTerrain.MapPixelX}, {daggerTerrain.MapPixelY}) ({context})");
// continue;
// }
//}

LocationPrefab locationPrefab = resourceManager.GetPrefabInfo(loc.prefab);
if (locationPrefab == null)
Expand All @@ -481,10 +481,10 @@ void OnTerrainPromoted(DaggerfallTerrain daggerTerrain, TerrainData terrainData)
continue;
}

if (PruneInstance(loc, locationPrefab))
{
continue;
}
//if (PruneInstance(loc, locationPrefab)) // carademono: Removing location check as type 0 placement now avoids overlaps and places multiples multiples per map pixel
//{
// continue;
//}

if (loc.type == 2)
{
Expand All @@ -504,14 +504,14 @@ void OnTerrainPromoted(DaggerfallTerrain daggerTerrain, TerrainData terrainData)
FindRiverCrossingCenter(loc, locationPrefab);
}

if (loc.type == 0)
{
if (terrainOccupied)
{
Debug.LogWarning($"Location instance already present at ({daggerTerrain.MapPixelX}, {daggerTerrain.MapPixelY}) ({context})");
continue;
}
}
//if (loc.type == 0) // carademono: Removing terrainOccupied check as type 0 placement now avoids overlaps and places multiples multiples per map pixel
//{
// if (terrainOccupied)
// {
// Debug.LogWarning($"Location instance already present at ({daggerTerrain.MapPixelX}, {daggerTerrain.MapPixelY}) ({context})");
// continue;
// }
//}

int count = 0;
float tmpAverageHeight = 0;
Expand Down