December 2014 files

This commit is contained in:
Loki Rautio
2026-03-01 11:00:23 -06:00
parent b691c43c44
commit 8fd3ac6e37
2049 changed files with 260190 additions and 134787 deletions

View File

@@ -5,11 +5,11 @@
bool ReedsFeature::place(Level *level, Random *random, int x, int y, int z)
{
for (int i = 0; i < 20; i++)
for (int i = 0; i < 20; i++)
{
int x2 = x + random->nextInt(4) - random->nextInt(4);
int y2 = y;
int z2 = z + random->nextInt(4) - random->nextInt(4);
int x2 = x + random->nextInt(4) - random->nextInt(4);
int y2 = y;
int z2 = z + random->nextInt(4) - random->nextInt(4);
// 4J Stu Added to stop reed features generating areas previously place by game rule generation
if(app.getLevelGenerationOptions() != NULL)
@@ -22,25 +22,25 @@ bool ReedsFeature::place(Level *level, Random *random, int x, int y, int z)
continue;
}
}
if (level->isEmptyTile(x2, y2, z2))
if (level->isEmptyTile(x2, y2, z2))
{
if (level->getMaterial(x2-1, y2-1, z2) == Material::water ||
level->getMaterial(x2+1, y2-1, z2) == Material::water ||
level->getMaterial(x2, y2-1, z2-1) == Material::water ||
level->getMaterial(x2, y2-1, z2+1) == Material::water)
if (level->getMaterial(x2-1, y2-1, z2) == Material::water ||
level->getMaterial(x2+1, y2-1, z2) == Material::water ||
level->getMaterial(x2, y2-1, z2-1) == Material::water ||
level->getMaterial(x2, y2-1, z2+1) == Material::water)
{
int h = 2 + random->nextInt(random->nextInt(3) + 1);
for (int yy = 0; yy < h; yy++)
int h = 2 + random->nextInt(random->nextInt(3) + 1);
for (int yy = 0; yy < h; yy++)
{
if ( Tile::reeds->canSurvive(level, x2, y2 + yy, z2) )
if ( Tile::reeds->canSurvive(level, x2, y2 + yy, z2) )
{
level->setTileNoUpdate(x2, y2 + yy, z2, Tile::reeds_Id);
}
}
}
}
}
level->setTileAndData(x2, y2 + yy, z2, Tile::reeds_Id, 0, Tile::UPDATE_CLIENTS);
}
}
}
}
}
return true;
return true;
}