diff --git a/addons/godot-git-plugin/win64/~libgit_plugin.windows.editor.x86_64.dll b/addons/godot-git-plugin/win64/~libgit_plugin.windows.editor.x86_64.dll deleted file mode 100644 index 47bbb1d..0000000 Binary files a/addons/godot-git-plugin/win64/~libgit_plugin.windows.editor.x86_64.dll and /dev/null differ diff --git a/assets/sprites/tiles/iso_tileset_with_wall.png b/assets/sprites/tiles/iso_tileset_with_wall.png index f343597..127c521 100644 Binary files a/assets/sprites/tiles/iso_tileset_with_wall.png and b/assets/sprites/tiles/iso_tileset_with_wall.png differ diff --git a/assets/sprites/tiles/iso_tileset_with_wall.xcf b/assets/sprites/tiles/iso_tileset_with_wall.xcf new file mode 100644 index 0000000..2838d8d Binary files /dev/null and b/assets/sprites/tiles/iso_tileset_with_wall.xcf differ diff --git a/scripts/isometric_map_layer_holder.gd b/scripts/isometric_map_layer_holder.gd index 968d8d1..cab5c7f 100644 --- a/scripts/isometric_map_layer_holder.gd +++ b/scripts/isometric_map_layer_holder.gd @@ -11,10 +11,13 @@ var zoom_speed = 0.1 var initial_camera_position = Vector2(0, 0) var initial_camera_zoom = Vector2(1, 1) +var INITIAL_GRID_SIZE_WIDTH = 50 # play area size x +var INITIAL_GRID_SIZE_LENGTH = 30 # play area size y +var INITIAL_GRID_SIZE_HEIGHT = 30 # play area size z -var GRID_SIZE_WIDTH = 50 # play area size x -var GRID_SIZE_LENGTH = 30 # play area size y -var GRID_SIZE_HEIGHT = 30 # play area size z +var GRID_SIZE_WIDTH = INITIAL_GRID_SIZE_WIDTH # play area size x +var GRID_SIZE_LENGTH = INITIAL_GRID_SIZE_LENGTH # play area size y +var GRID_SIZE_HEIGHT = INITIAL_GRID_SIZE_HEIGHT # play area size z var TILE_SIZE = 32 # in px var TILE_SIZE_ISOMETRIC_X = 32 # in px var TILE_SIZE_ISOMETRIC_Y = 16 # in px @@ -56,9 +59,9 @@ func create_debug_map_array(): y_array.append(z_array) _debug_map.append(y_array) - for z in GRID_SIZE_HEIGHT: - for y in GRID_SIZE_LENGTH: - for x in GRID_SIZE_WIDTH: + for z in INITIAL_GRID_SIZE_HEIGHT: + for y in INITIAL_GRID_SIZE_LENGTH: + for x in INITIAL_GRID_SIZE_WIDTH: var coord_x = x + (-1 * z) + OFFSET var coord_y = y + (-1 * z) - OFFSET @@ -75,39 +78,45 @@ func create_debug_map_array(): "gravity": null } _debug_map[x][y][z] = tile_data - for y in GRID_SIZE_LENGTH: - for x in GRID_SIZE_WIDTH: + # Bottum + for y in INITIAL_GRID_SIZE_LENGTH: + for x in INITIAL_GRID_SIZE_WIDTH: var tile = _debug_map[x][y][0] tile["atlas_position"] = BLUE_ISOMETRICTILE_ATLAS_POSITION tile["visibility"] = true - - for y in GRID_SIZE_LENGTH: - for x in GRID_SIZE_WIDTH: - var tile = _debug_map[x][y][GRID_SIZE_HEIGHT-1] + # Top + for y in INITIAL_GRID_SIZE_LENGTH: + for x in INITIAL_GRID_SIZE_WIDTH: + var tile = _debug_map[x][y][INITIAL_GRID_SIZE_HEIGHT-1] tile["atlas_position"] = BLUE_ISOMETRICTILE_ATLAS_POSITION tile["visibility"] = true - for z in range(1,GRID_SIZE_HEIGHT-1): - for x in GRID_SIZE_WIDTH: + for z in range(1,INITIAL_GRID_SIZE_HEIGHT-1): + for x in INITIAL_GRID_SIZE_WIDTH: var tile = _debug_map[x][0][z] tile["atlas_position"] = GREEN_ISOMETRICTILE_ATLAS_POSITION tile["visibility"] = true - for z in range(1,GRID_SIZE_HEIGHT-1): - for x in GRID_SIZE_WIDTH: - var tile = _debug_map[x][GRID_SIZE_LENGTH-1][z] + for z in range(1,INITIAL_GRID_SIZE_HEIGHT-1): + for x in INITIAL_GRID_SIZE_WIDTH: + var tile = _debug_map[x][INITIAL_GRID_SIZE_LENGTH-1][z] tile["atlas_position"] = GREEN_ISOMETRICTILE_ATLAS_POSITION tile["visibility"] = true - for z in range(1,GRID_SIZE_HEIGHT-1): - for y in range(1,GRID_SIZE_LENGTH-1): + for z in range(1,INITIAL_GRID_SIZE_HEIGHT-1): + for y in range(1,INITIAL_GRID_SIZE_LENGTH-1): var tile = _debug_map[0][y][z] tile["atlas_position"] = BLACK_ISOMETRICTILE_ATLAS_POSITION tile["visibility"] = true - for z in range(1,GRID_SIZE_HEIGHT-1): - for y in range(1,GRID_SIZE_LENGTH-1): - var tile = _debug_map[GRID_SIZE_WIDTH-1][y][z] + for z in range(1,INITIAL_GRID_SIZE_HEIGHT-1): + for y in range(1,INITIAL_GRID_SIZE_LENGTH-1): + var tile = _debug_map[INITIAL_GRID_SIZE_WIDTH-1][y][z] tile["atlas_position"] = RED_ISOMETRICTILE_ATLAS_POSITION tile["visibility"] = true + + + GRID_SIZE_WIDTH = INITIAL_GRID_SIZE_WIDTH # play area size x + GRID_SIZE_LENGTH = INITIAL_GRID_SIZE_LENGTH # play area size y + GRID_SIZE_HEIGHT = INITIAL_GRID_SIZE_HEIGHT # play area size z return _debug_map @@ -382,9 +391,9 @@ func _input(event): func _on_reset_button_pressed() -> void: # Reset camera position and zoom - # initialize_map_layers() - # debug_map = create_debug_map_array() - # draw_visible_tiles() + debug_map = create_debug_map_array() + initialize_map_layers() + draw_visible_tiles() camera.position = initial_camera_position camera.zoom = initial_camera_zoom