Add basic entities

Author: jakubmeysner

src/generate.cpp

@@ -107,6 +107,35 @@ World generateOverworld(State *state) {
         }
     }
 
+    std::bernoulli_distribution zombieDistrib(0.001);
+
+    std::bernoulli_distribution archerDistrib(0.0005);
+
+    std::bernoulli_distribution boomerDistrib(0.0001);
+
+    for (int c = 0; c < 1000; c++) {
+        for (int l = 0; l < 1000; l++) {
+            if (world[c][l].type == BlockType::EMPTY) {
+                if (zombieDistrib(gen)) {
+                    auto entity = Entity();
+                    entity.type = EntityType::ZOMBIE;
+                    entity.position = Position(c, l);
+                    state->entities.push_back(entity);
+                } else if (archerDistrib(gen)) {
+                    auto entity = Entity();
+                    entity.type = EntityType::ARCHER;
+                    entity.position = Position(c, l);
+                    state->entities.push_back(entity);
+                } else if (boomerDistrib(gen)) {
+                    auto entity = Entity();
+                    entity.type = EntityType::BOOMER;
+                    entity.position = Position(c, l);
+                    state->entities.push_back(entity);
+                }
+            }
+        }
+    }
+
     return world;
 }
 
@@ -145,6 +174,8 @@ void generate(State *state) {
             std::uniform_int_distribution<int> playerPosDistrib(100, 900);
             state->playerPosition = Position(playerPosDistrib(gen), playerPosDistrib(gen));
 
+            state->entities.clear();
+
             switch (state->level) {
                 case Level::OVERWORLD:
                     state->world = generateOverworld(state);

src/main.cpp

@@ -13,19 +13,6 @@ int main() {
     PlaySound(".\\assets\\amogus-drip.wav", nullptr, SND_ASYNC | SND_FILENAME | SND_LOOP);
 
     SetConsoleOutputCP(65001);
-
-    while (true) {
-        CONSOLE_SCREEN_BUFFER_INFO bufferInfo;
-        GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &bufferInfo);
-
-        if (bufferInfo.dwSize.X >= 150 && bufferInfo.dwSize.Y >= 30) break;
-
-        std::cout << "Zwiększ rozmiar okna do min. 150x30 (aktualny " << bufferInfo.dwSize.X << "x"
-                  << bufferInfo.dwSize.Y << "), a następnie naciśnij ENTER!" << std::endl;
-
-        while (!wasKeyPressed(VK_RETURN));
-    }
-
     setCursorVisibility(false);
 
     auto state = State();

src/render.cpp

@@ -317,7 +317,28 @@ void render(State *state) {
                                 auto y = lStartPos - lStart + l;
 
                                 if (x >= 0 && x <= 1000 && y >= 0 && y <= 1000) {
-                                    if (state->world[x][y].item.has_value()) {
+                                    auto entity = std::find_if(
+                                            std::begin(state->entities), std::end(state->entities),
+                                            [x, y](Entity entity) {
+                                                return entity.position.x == x && entity.position.y == y;
+                                            }
+                                    );
+
+                                    if (entity != std::end(state->entities)) {
+                                        switch ((*entity).type) {
+                                            case EntityType::ZOMBIE:
+                                                std::cout << "z";
+                                                break;
+                                            case EntityType::ARCHER:
+                                                std::cout << "a";
+                                                break;
+                                            case EntityType::BOOMER:
+                                                std::cout << "b";
+                                                break;
+                                            default:
+                                                std::cout << "t";
+                                        }
+                                    } else if (state->world[x][y].item.has_value()) {
                                         std::cout << "i";
                                     } else {
                                         switch (state->world[x][y].type) {

src/state.h

@@ -4,6 +4,7 @@
 #include <optional>
 #include <sstream>
 #include <iomanip>
+#include <map>
 
 enum class Screen {
     MAIN_MENU, SETTINGS, SETTINGS_DIFFICULTY_LEVEL, PLAY_DIFFICULTY_LEVEL, PLAY_LEVEL,
@@ -52,6 +53,10 @@ class Position {
 
     int x = 0;
     int y = 0;
+
+    bool operator<(Position const &r) const {
+        return this->x < r.x;
+    }
 };
 
 enum class ItemType {
@@ -107,6 +112,16 @@ class Block {
 
 typedef std::vector<std::vector<Block>> World;
 
+enum class EntityType {
+    ZOMBIE, ARCHER, BOOMER
+};
+
+class Entity {
+public:
+    EntityType type = EntityType::ZOMBIE;
+    Position position = Position(0, 0);
+};
+
 class State {
 public:
     bool exit = false;
@@ -148,4 +163,6 @@ class State {
     int maxArrows = 5;
 
     int keys = 0;
+
+    std::vector<Entity> entities;
 };