flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

DungeonRooms: Chests are never placed next to each other.

Browse Source
This commit is contained in:
Mattes D 2014-08-26 17:46:14 +03:00
parent a40f358064
commit 0c3c136c72
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/Generating/DungeonRoomsFinisher.cpp
View File

@ -40,10 +40,22 @@ public:
m_EndX(a_OriginX + a_HalfSizeX), m_EndX(a_OriginX + a_HalfSizeX),
m_StartZ(a_OriginZ - a_HalfSizeZ), m_StartZ(a_OriginZ - a_HalfSizeZ),
m_EndZ(a_OriginZ + a_HalfSizeZ), m_EndZ(a_OriginZ + a_HalfSizeZ),
m_FloorHeight(a_FloorHeight), m_FloorHeight(a_FloorHeight)
m_Chest1(SelectChestCoords(a_Noise, a_OriginX + 1, a_OriginZ)),
m_Chest2(SelectChestCoords(a_Noise, a_OriginX + 2, a_OriginZ))
{ {
/*
Pick coords next to the wall for the chests.
This is done by indexing the possible coords, picking any one for the first chest
and then picking another position for the second chest that is not adjacent to the first pos
*/
int rnd = a_Noise.IntNoise2DInt(a_OriginX, a_OriginZ) / 7;
int SizeX = m_EndX - m_StartX - 1;
int SizeZ = m_EndZ - m_StartZ - 1;
int NumPositions = 2 * SizeX + 2 * SizeZ;
int FirstChestPos = rnd % NumPositions; // The corner positions are a bit more likely, but we don't mind
rnd = rnd / 512;
int SecondChestPos = (FirstChestPos + 2 + (rnd % (NumPositions - 3))) % NumPositions;
m_Chest1 = DecodeChestCoords(FirstChestPos, SizeX, SizeZ);
m_Chest2 = DecodeChestCoords(SecondChestPos, SizeX, SizeZ);
} }
protected: protected:
@ -65,36 +77,29 @@ protected:
/** Selects the coords for the chest, using the noise and coords provided. /** Decodes the position index along the room walls into a proper 2D position for a chest. */
Assumes that the room XZ ranges are already assigned. */ Vector3i DecodeChestCoords(int a_PosIdx, int a_SizeX, int a_SizeZ)
Vector3i SelectChestCoords(cNoise & a_Noise, int a_X, int a_Z)
{ {
// Pick a coord next to the wall: if (a_PosIdx < a_SizeX)
int rnd = a_Noise.IntNoise2DInt(a_X, a_Z) / 7;
int SizeX = m_EndX - m_StartX - 1;
int SizeZ = m_EndZ - m_StartZ - 1;
rnd = rnd % (2 * SizeX + 2 * SizeZ);
if (rnd < SizeX)
{ {
// Return a coord on the ZM side of the room: // Return a coord on the ZM side of the room:
return Vector3i(m_StartX + rnd + 1, E_META_CHEST_FACING_ZP, m_StartZ + 1); return Vector3i(m_StartX + a_PosIdx + 1, E_META_CHEST_FACING_ZP, m_StartZ + 1);
} }
rnd -= SizeX; a_PosIdx -= a_SizeX;
if (rnd < SizeZ) if (a_PosIdx < a_SizeZ)
{ {
// Return a coord on the XP side of the room: // Return a coord on the XP side of the room:
return Vector3i(m_EndX - 1, E_META_CHEST_FACING_XM, m_StartZ + rnd + 1); return Vector3i(m_EndX - 1, E_META_CHEST_FACING_XM, m_StartZ + a_PosIdx + 1);
} }
rnd -= SizeZ; a_PosIdx -= a_SizeZ;
if (rnd < SizeX) if (a_PosIdx < a_SizeX)
{ {
// Return a coord on the ZP side of the room: // Return a coord on the ZP side of the room:
return Vector3i(m_StartX + rnd + 1, E_META_CHEST_FACING_ZM, m_StartZ + 1); return Vector3i(m_StartX + a_PosIdx + 1, E_META_CHEST_FACING_ZM, m_StartZ + 1);
} }
rnd -= SizeX; a_PosIdx -= a_SizeX;
// Return a coord on the XM side of the room: // Return a coord on the XM side of the room:
return Vector3i(m_StartX + 1, E_META_CHEST_FACING_XP, m_StartZ + rnd + 1); return Vector3i(m_StartX + 1, E_META_CHEST_FACING_XP, m_StartZ + a_PosIdx + 1);
} }