benkyd/OLCCodeJam2020-The-Great-Machine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

done!

Browse Source
This commit is contained in:
Ben
2020-09-06 19:00:09 +01:00
parent 9cd540a9f3
commit c2d376ace6
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
The Great Machine.exe
View File

Binary file not shown.

18
The Great Machine/Dungeon.cpp
View File

@@ -498,8 +498,12 @@ void Dungeon::Update(olc::PixelGameEngine* engine, float fTime)
int enemyBoundsRight = enemyBoundsLeft + 1280.0f; int enemyBoundsRight = enemyBoundsLeft + 1280.0f;
int enemyBoundsBottom = enemyBoundsTop + 720.0f; int enemyBoundsBottom = enemyBoundsTop + 720.0f;
auto rangedRand = [](float min, float max) -> int {
return static_cast<int>(min) + rand() % ((static_cast<int>(max) + 1) - static_cast<int>(min));
};
// spawn enemies // spawn enemies
if (rand() % 100 < 1 && Enemies.size() < 20) if (rand() % 100 < 1 && Enemies.size() <= 7)
{ {
Enemy* enemy = new Enemy(); Enemy* enemy = new Enemy();
enemy->Type = EEntity::Type::Enemy; enemy->Type = EEntity::Type::Enemy;
@@ -511,17 +515,13 @@ void Dungeon::Update(olc::PixelGameEngine* engine, float fTime)
if (enemyBoundsLeft == 0) enemyBoundsLeft = 1; if (enemyBoundsLeft == 0) enemyBoundsLeft = 1;
if (enemyBoundsTop == 0) enemyBoundsTop = 1; if (enemyBoundsTop == 0) enemyBoundsTop = 1;
auto rangedRand = [](float min, float max) -> int {
return static_cast<int>(min) + rand() % ((static_cast<int>(max) + 1) - static_cast<int>(min));
};
enemy->Coords = { static_cast<float>(rangedRand(enemyBoundsLeft, enemyBoundsRight)), static_cast<float>(rangedRand(enemyBoundsTop, enemyBoundsBottom) ) }; enemy->Coords = { static_cast<float>(rangedRand(enemyBoundsLeft, enemyBoundsRight)), static_cast<float>(rangedRand(enemyBoundsTop, enemyBoundsBottom) ) };
enemy->dxdy = { static_cast<float>(rand() % 10 - 5), static_cast<float>(rand() % 10 - 5) }; enemy->dxdy = { static_cast<float>(rand() % 10 - 5), static_cast<float>(rand() % 10 - 5) };
float distanceFromPlayer = vecDistance(Player->Coords, enemy->Coords); float distanceFromPlayer = vecDistance(Player->Coords, enemy->Coords);
_Logger.Debug(enemy->Coords.x, " ", enemy->Coords.y, " ", distanceFromPlayer); _Logger.Debug(enemy->Coords.x, " ", enemy->Coords.y, " ", distanceFromPlayer);
if (distanceFromPlayer > 300.0f) if (distanceFromPlayer > 200.0f)
{ {
enemy->HitBox = new Collider{ 0, 0, 28, 36 }; enemy->HitBox = new Collider{ 0, 0, 28, 36 };
Enemies.push_back(enemy); Enemies.push_back(enemy);
@@ -542,7 +542,7 @@ void Dungeon::Update(olc::PixelGameEngine* engine, float fTime)
enemy->Coords += enemy->dxdy; enemy->Coords += enemy->dxdy;
float distanceFromPlayer = vecDistance(Player->Coords, enemy->Coords); float distanceFromPlayer = vecDistance(Player->Coords, enemy->Coords);
if (distanceFromPlayer > 550.0f) if (distanceFromPlayer > 500.0f)
{ {
Enemies.erase(Enemies.begin() + i); Enemies.erase(Enemies.begin() + i);
delete enemy->HitBox; delete enemy->HitBox;
@@ -554,9 +554,7 @@ void Dungeon::Update(olc::PixelGameEngine* engine, float fTime)
if (!colliding) continue; if (!colliding) continue;
SoundHit.play(); SoundHit.play();
Player->Life--; Player->Life--;
Enemies.erase(Enemies.begin() + i); enemy->Coords = { static_cast<float>(rangedRand(enemyBoundsLeft, enemyBoundsRight)), static_cast<float>(rangedRand(enemyBoundsTop, enemyBoundsBottom) ) };
delete enemy->HitBox;
delete enemy;
} }
if (StartedSpawning != true) return; if (StartedSpawning != true) return;

BIN
The-Great-Machine.zip
View File

Binary file not shown.