Skip to content
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

Jump to bottom

Prevent PlaceUniqueMonster() loop from finding random location for quest monsters with a set position #7464

Merged
merged 2 commits into from
Oct 8, 2024
Merged

Prevent PlaceUniqueMonster() loop from finding random location for quest monsters with a set position #7464

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9788a8f
Fix PlaceUniqueMonst()
kphoenix137 Oct 8, 2024
2d9ab68
Clean up PlaceUniqueMonst()
AJenbo Oct 8, 2024
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
109 changes: 60 additions & 49 deletions Source/monster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,81 +338,92 @@ void PlaceUniqueMonst(UniqueMonsterType uniqindex, size_t minionType, int bosspa
Monster &monster = Monsters[ActiveMonsterCount];
const auto &uniqueMonsterData = UniqueMonstersData[static_cast<size_t>(uniqindex)];

int count = 0;
Point position;
while (true) {
position = Point { GenerateRnd(80), GenerateRnd(80) } + Displacement { 16, 16 };
int count2 = 0;
for (int x = position.x - 3; x < position.x + 3; x++) {
for (int y = position.y - 3; y < position.y + 3; y++) {
if (InDungeonBounds({ x, y }) && CanPlaceMonster({ x, y })) {
count2++;
}
}
}

if (count2 < 9) {
count++;
if (count < 1000) {
continue;
}
}
bool hasPredefinedPosition = true;

if (CanPlaceMonster(position)) {
break;
}
}

if (uniqindex == UniqueMonsterType::SnotSpill) {
switch (uniqindex) {
case UniqueMonsterType::SnotSpill:
position = SetPiece.position.megaToWorld() + Displacement { 8, 12 };
}
if (uniqindex == UniqueMonsterType::WarlordOfBlood) {
break;
case UniqueMonsterType::WarlordOfBlood:
position = SetPiece.position.megaToWorld() + Displacement { 6, 7 };
}
if (uniqindex == UniqueMonsterType::Zhar) {
break;
case UniqueMonsterType::Zhar:
for (int i = 0; i < themeCount; i++) {
if (i == zharlib) {
position = themeLoc[i].room.position.megaToWorld() + Displacement { 4, 4 };
break;
}
}
}
if (setlevel) {
if (uniqindex == UniqueMonsterType::Lazarus) {
break;
case UniqueMonsterType::Lazarus:
if (setlevel) {
position = { 32, 46 };
} else {
position = SetPiece.position.megaToWorld() + Displacement { 3, 6 };
}
if (uniqindex == UniqueMonsterType::RedVex) {
break;
case UniqueMonsterType::RedVex:
if (setlevel) {
position = { 40, 45 };
} else {
position = SetPiece.position.megaToWorld() + Displacement { 5, 3 };
}
if (uniqindex == UniqueMonsterType::BlackJade) {
break;
case UniqueMonsterType::BlackJade:
if (setlevel) {
position = { 38, 49 };
} else {
position = SetPiece.position.megaToWorld() + Displacement { 5, 9 };
}
if (uniqindex == UniqueMonsterType::SkeletonKing) {
break;
case UniqueMonsterType::SkeletonKing:
if (setlevel) {
position = { 35, 47 };
}
} else {
if (uniqindex == UniqueMonsterType::Lazarus) {
position = SetPiece.position.megaToWorld() + Displacement { 3, 6 };
}
if (uniqindex == UniqueMonsterType::RedVex) {
position = SetPiece.position.megaToWorld() + Displacement { 5, 3 };
}
if (uniqindex == UniqueMonsterType::BlackJade) {
position = SetPiece.position.megaToWorld() + Displacement { 5, 9 };
}
}
if (uniqindex == UniqueMonsterType::Butcher) {
break;
case UniqueMonsterType::Butcher:
position = SetPiece.position.megaToWorld() + Displacement { 4, 4 };
}

if (uniqindex == UniqueMonsterType::NaKrul) {
break;
case UniqueMonsterType::NaKrul:
if (UberRow == 0 || UberCol == 0) {
UberDiabloMonsterIndex = -1;
return;
}
position = { UberRow - 2, UberCol };
UberDiabloMonsterIndex = static_cast<int>(ActiveMonsterCount);
break;
default:
hasPredefinedPosition = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would probably just place the fallback here instead of using a bool

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also moving the position logic to it's own sub method will allow you to simplify things even more.

break;
}

if (!hasPredefinedPosition) {
int count = 0;
while (true) {
position = Point { GenerateRnd(80), GenerateRnd(80) } + Displacement { 16, 16 };
int count2 = 0;
for (int x = position.x - 3; x < position.x + 3; x++) {
for (int y = position.y - 3; y < position.y + 3; y++) {
if (InDungeonBounds({ x, y }) && CanPlaceMonster({ x, y })) {
count2++;
}
}
}

if (count2 < 9) {
count++;
if (count < 1000) {
continue;
}
}

if (CanPlaceMonster(position)) {
break;
}
}
}

const size_t typeIndex = GetMonsterTypeIndex(uniqueMonsterData.mtype);
PlaceMonster(ActiveMonsterCount, typeIndex, position);
ActiveMonsterCount++;
Expand Down
Loading