Merge pull request coders-school#102 from lukasz-kukulka/generateStoreInIslands

Generate stores in  every islands

Author: lukasz-kukulka

shm/inc/Island.hpp

@@ -1,11 +1,13 @@
 #pragma once
 
 #include <cstddef> 
+#include <memory>
+
+#include "shm/inc/Store.hpp"
 
 // class responsible for manage landmass in game
 class Island {
 public:
-
     // class responsible for manage coordinates of islands in game
     class Coordinates {
     public:
@@ -23,7 +25,9 @@ class Island {
     explicit Island(const Island::Coordinates& position);
 
     Coordinates getCoordinates() const { return position_; }
-    
+    std::shared_ptr<Store> getStore() { return store_; }
+
 private:
     const Coordinates position_;
+    std::shared_ptr<Store>store_;
 };

shm/inc/Store.hpp

@@ -15,7 +15,7 @@ constexpr size_t STORE_CAPACITY { 1000 };
 
 class Store : public Subscriber {
 public:
-
+    Store();
     enum class Response {
         done, 
         lack_of_money, 
@@ -32,13 +32,13 @@ class Store : public Subscriber {
     void nextDay() override;
     size_t randomGenerate(size_t min, size_t max);
     Item::Rarity rarityCoversion(size_t numberForConversion);
-
+    
+private:
     void createAllCargo();
     void createFruits();
     void createAlcohols();
     void createItems();
     void createDryFruits();
 
-private:
     std::vector<std::unique_ptr<Cargo>> cargo_;
 };

shm/src/Game.cpp

@@ -23,7 +23,7 @@ Game::Game(size_t money, size_t gameDays, size_t finalGoal)
 void Game::startGame() {
     printWelcomeScreen();
     printIntenface();
-    printMap();
+    printMap();    
     // while (game_days_ > current_day_) {
     //     printMenu();  
     //     if (isGameWon()) {

shm/src/Island.cpp

@@ -3,7 +3,6 @@
 #include <cmath>
 
 Island::Coordinates::Coordinates(size_t positionX, size_t positionY) 
-
     : positionX_(positionX)
     , positionY_(positionY)
 {}
@@ -14,7 +13,9 @@ bool Island::Coordinates::operator==(const Coordinates& position) const {
 
 Island::Island(const Island::Coordinates& position)
     : position_(position)
-{}
+{
+    store_ = std::make_shared<Store>();
+}
 
 size_t Island::Coordinates::distance(const Coordinates& lhs, const Coordinates& rhs) {
     size_t result = static_cast<size_t>(std::sqrt(std::pow((int)lhs.positionX_ - (int)rhs.positionX_, 2) + std::pow((int)lhs.positionY_ - (int)rhs.positionY_, 2)));

shm/src/Store.cpp

@@ -9,6 +9,11 @@
 #include "shm/inc/Fruit.hpp"
 #include "shm/inc/Player.hpp"
 
+Store::Store()
+{
+    createAllCargo();
+}
+
 std::ostream& operator<<(std::ostream& out, const Store& store){
     for (size_t i = 0; i < store.cargo_.size(); i++) {
         out << "|" << std::setfill('-') << std::setw (100) << "|\n";