Randomized map generator

#Scenes/TestingScene.tscn

@@ -22,29 +22,13 @@
 
 [sub_resource type="Resource" id="Resource_82ci8"]
 script = ExtResource("10_qowiy")
-damage_to_apply_to_target = 0.0
-damage_to_apply_to_caster = 0.0
-status_to_apply_to_target = Array[Resource("res://Status/StatusBase.gd")]([])
-status_to_apply_to_caster = Array[Resource("res://Status/StatusBase.gd")]([])
-affect_all_targets = false
-affect_all_casters = false
-amount_of_cards_to_draw = 0
-amount_of_cards_to_discard = 0
 application_type = 1
 card_title = "NULL"
 card_description = "NULL"
 card_effects_data = Array[Resource("res://Cards/Effects/EffectData.gd")]([])
 
 [sub_resource type="Resource" id="Resource_bjuo7"]
 script = ExtResource("10_qowiy")
-damage_to_apply_to_target = 0.0
-damage_to_apply_to_caster = 0.0
-status_to_apply_to_target = Array[Resource("res://Status/StatusBase.gd")]([])
-status_to_apply_to_caster = Array[Resource("res://Status/StatusBase.gd")]([])
-affect_all_targets = false
-affect_all_casters = false
-amount_of_cards_to_draw = 0
-amount_of_cards_to_discard = 0
 application_type = 1
 card_title = "NULL"
 card_description = "NULL"

Map/MapManager.gd

@@ -1,15 +1,14 @@
 extends Node2D
 ## Class to manage backend for rooms (generation and such)
 
-#layout changes the width of the map's floors
-static func create_map(floors_width: Array[int]) -> MapBase: ## Generates and Populates a map with rooms that have random room types. More in depth algorithms will be added in the future
+#map_floors_width changes the width of the map's floors
+static func create_map(map_floors_width: Array[int]) -> MapBase: ## Generates and Populates a map with rooms that have random room types. More in depth algorithms will be added in the future
  var _map: MapBase = MapBase.new()
  var _grid: Array[Array] = [] ## 2d array to return. this will be populated with rooms
- var _max_floor_size: int = floors_width.max()
- for index_height: int in range(floors_width.size()): ## loop through the floor and append null to create a square grid
+ var _max_floor_size: int = map_floors_width.max()
+ for index_height: int in range(map_floors_width.size()): ## loop through the floor and append null to create a square grid
 
-
- var _floor_width : int = floors_width[index_height]
+ var _floor_width : int = map_floors_width[index_height]
  var _padding_size : int = (_max_floor_size - _floor_width)/2
 
  var _padding:Array = []
@@ -18,12 +17,12 @@ static func create_map(floors_width: Array[int]) -> MapBase: ## Generates and Po
  _grid.append([])
  _grid[index_height].append_array(_padding)
 
- for index_width: int in range(floors_width[index_height]):## loop through elements of the grid and assign a room type
+ for index_width: int in range(map_floors_width[index_height]):## loop through elements of the grid and assign a room type
  var _rand_type_index: int = randi_range(0, GlobalVar.EVENTS_CLASSIFICATION.size() - 1)
  var _room_event: EventBase = GlobalVar.EVENTS_CLASSIFICATION[_rand_type_index].new()
  var _generated_room: RoomBase = RoomBase.new()
  _generated_room.room_event = _room_event
- _grid[index_height].insert(index_width+_padding_size,_generated_room as RoomBase)
+ _grid[index_height].append(_generated_room as RoomBase)
  _grid[index_height].append_array(_padding)
  _map.rooms = _grid
  return _map as MapBase

Map/RoomBase.gd

@@ -7,3 +7,6 @@ class_name RoomBase
 @export var light_level: int = 0
 @export var has_torch: bool = false
 @export var room_event: EventBase
+
+func _to_string() -> String:
+ return "RoomBase"

Tests/test_map.gd

@@ -8,7 +8,9 @@ func test_map_gen():
  var expected_null_array: Array[Array] = [[0,0], [0,1], [0,3],[0,4],[1,0],[1,4],[3,0],[3,4],[4,0],[4,1],[4,3],[4,4]]
  var expected_exists_array: Array[Array] = [[0,2],[1,1],[1,2],[1,3],[2,0],[2,1],[2,2],[2,3],[2,4],[3,1],[3,2],[3,3],[4,2]]
  for couple: Array[int] in expected_null_array:
- assert_null(test_map.rooms[couple[0]][couple[1]], "expected null at"+str(couple))
-
+ var _room = test_map.rooms[couple[0]][couple[1]]
+ assert_null(test_map.rooms[couple[0]][couple[1]], "Expected null at %s but got %s" % [couple, _room])
+
  for couple: Array[int] in expected_exists_array:
- assert_not_null(test_map.rooms[couple[0]][couple[1]], "expected not null at"+str(couple))
+ var _room = test_map.rooms[couple[0]][couple[1]]
+ assert_not_null(test_map.rooms[couple[0]][couple[1]], "Expected not null at %s but got %s" % [couple, _room])