From c020d2277abcf33ea2896cc6fc487a7a11e91989 Mon Sep 17 00:00:00 2001
From: JakubR <jakrad6@st.amu.edu.pl>
Date: Sat, 27 Mar 2021 18:25:26 +0100
Subject: [PATCH] changed JsonGenerator definition to support new mine types

---
 json_generator.py | 74 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 63 insertions(+), 11 deletions(-)

diff --git a/json_generator.py b/json_generator.py
index 09a1f4a..0c15d62 100644
--- a/json_generator.py
+++ b/json_generator.py
@@ -29,9 +29,41 @@ class JsonGenerator:
                 if random.random() < 0.75:
                     # creating a tile without a mine
                     self.add_tile((i, j), random_tile_color)
+
                 else:
+                    # picking random mine attribute values
+                    random_attribute_values = []
+
+                    for attr_type in const.STRUCT_MINE_ATTRIBUTE_TYPES[random_mine_type]:
+
+                        if attr_type == int:
+                            min_value, max_value = (num_of_columns + num_of_rows) / 2, 2 *(num_of_columns + num_of_rows)
+                            random_value = random.randint(min_value, max_value)
+                            random_attribute_values.append(random_value)
+
+                        elif attr_type == (int, int):
+
+                            if i > 0:
+                                rand_i = random.randint(0, (i - 1))
+                                rand_j = random.randint(0, (num_of_columns - 1))
+                                random_attribute_values.append(str(rand_i) + ',' + str(rand_j))
+                                self.set_a_mine((rand_i, rand_j), "chained", [None])
+
+                            elif j > 0:
+                                rand_i = 0
+                                rand_j = random.randint(0, (j - 1))
+                                random_attribute_values.append(str(rand_i) + ',' + str(rand_j))
+                                self.set_a_mine((rand_i, rand_j), "chained", [None])
+
+                            else:
+                                random_attribute_values.append(None)
+
                     # creating a tile with a mine
-                    self.add_tile_with_a_mine((i, j), random_tile_color, random_mine_type)
+                    self.add_tile_with_a_mine(
+                        (i, j),
+                        random_tile_color,
+                        random_mine_type,
+                        random_attribute_values)
 
     # adds a new tile or edits an existing one in the grid field
     def add_tile(self, position, color):
@@ -44,32 +76,52 @@ class JsonGenerator:
         }
 
     # adds a new tile with a mine or edits an existing one in the grid field
-    def add_tile_with_a_mine(self, position, color, mine_type):
+    def add_tile_with_a_mine(self, position, color, mine_type, attribute_values):
         # getting added/edited tile's index values
         row, column = position
-        # creating a new tile with a mine
+        # setting mine data using attribute_values
+        mine_values = const.STRUCT_MINE_ATTRIBUTES[mine_type]
+
+        for key in mine_values.keys():
+            if key not in const.HARDCODED_VALUES and len(attribute_values) > 0:
+                mine_values[key] = attribute_values.pop(0)
+
+        # creating a new tile
         self.grid[str(row) + ',' + str(column)] = {
-            "color": color,
-            "mine": {
-                "mine_type": mine_type
-            }
+            "color": color
         }
 
+        # updating the tile with a mine field
+        self.grid[str(row) + ',' + str(column)]["mine"] = {}
+
+        for key in mine_values.keys():
+            self.grid[str(row) + ',' + str(column)]["mine"][key] = mine_values[key]
+
     # deletes a mine with a given position from the grid field
     def delete_a_tile(self, position):
         # getting tile's index values
         row, column = position
+
         # deleting a tile with given key
         self.grid.pop(str(row) + ',' + str(column))
 
     # adds a mine to a tile stored in the grid field
-    def add_a_mine(self, position, mine_type):
+    def set_a_mine(self, position, mine_type, attribute_values):
         # getting edited tile's index values
         row, column = position
+
+        # setting mine data using attribute_values
+        mine_values = const.STRUCT_MINE_ATTRIBUTES[mine_type]
+
+        for key in mine_values.keys():
+            if key not in const.HARDCODED_VALUES and len(attribute_values) > 0:
+                mine_values[key] = attribute_values.pop(0)
+
         # adding a mine to the edited tile
-        self.grid[str(row) + ',' + str(column)]["mine"] = {
-            "mine_type": mine_type
-        }
+        self.grid[str(row) + ',' + str(column)]["mine"] = {}
+
+        for key in mine_values.keys():
+            self.grid[str(row) + ',' + str(column)]["mine"][key] = mine_values[key]
 
     # deletes a mine from a tile stored in the grid field
     def delete_a_mine(self, position):