diff options
Diffstat (limited to 'src/tools/world_generator')
| -rw-r--r-- | src/tools/world_generator/scenes/WorldGenerator.tscn | 136 | ||||
| -rw-r--r-- | src/tools/world_generator/scripts/walker_head.gd | 19 | ||||
| -rw-r--r-- | src/tools/world_generator/scripts/walker_unit.gd | 6 | ||||
| -rw-r--r-- | src/tools/world_generator/scripts/world_generator.gd | 6 | ||||
| -rw-r--r-- | src/tools/world_generator/sprites/ground_tileset.png | bin | 0 -> 547 bytes | |||
| -rw-r--r-- | src/tools/world_generator/sprites/ground_tileset.png.import | 35 |
6 files changed, 175 insertions, 27 deletions
diff --git a/src/tools/world_generator/scenes/WorldGenerator.tscn b/src/tools/world_generator/scenes/WorldGenerator.tscn index 824d298..c098207 100644 --- a/src/tools/world_generator/scenes/WorldGenerator.tscn +++ b/src/tools/world_generator/scenes/WorldGenerator.tscn @@ -1,16 +1,13 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] -[ext_resource path="res://tools/world_generator/sprites/white.png" type="Texture" id=1] +[ext_resource path="res://tools/world_generator/sprites/ground_tileset.png" type="Texture" id=1] [ext_resource path="res://tools/world_generator/sprites/black.png" type="Texture" id=2] [ext_resource path="res://tools/world_generator/scenes/WalkerUnit.tscn" type="PackedScene" id=3] [ext_resource path="res://tools/world_generator/scenes/WalkerHead.tscn" type="PackedScene" id=4] [ext_resource path="res://tools/world_generator/scripts/world_generator.gd" type="Script" id=5] -[sub_resource type="ConvexPolygonShape2D" id=2] -points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 ) - [sub_resource type="TileSet" id=1] -0/name = "white.png 0" +0/name = "ground_tileset.png 0" 0/texture = ExtResource( 1 ) 0/tex_offset = Vector2( 0, 0 ) 0/modulate = Color( 1, 1, 1, 1 ) @@ -24,39 +21,148 @@ points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 ) 0/shape_one_way_margin = 0.0 0/shapes = [ ] 0/z_index = 0 -1/name = "black.png 1" -1/texture = ExtResource( 2 ) +1/name = "ground_tileset.png 1" +1/texture = ExtResource( 1 ) 1/tex_offset = Vector2( 0, 0 ) 1/modulate = Color( 1, 1, 1, 1 ) -1/region = Rect2( 0, 0, 16, 16 ) +1/region = Rect2( 16, 0, 16, 16 ) 1/tile_mode = 0 1/occluder_offset = Vector2( 0, 0 ) 1/navigation_offset = Vector2( 0, 0 ) 1/shape_offset = Vector2( 0, 0 ) 1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -1/shape = SubResource( 2 ) 1/shape_one_way = false -1/shape_one_way_margin = 1.0 -1/shapes = [ { +1/shape_one_way_margin = 0.0 +1/shapes = [ ] +1/z_index = 0 +2/name = "ground_tileset.png 2" +2/texture = ExtResource( 1 ) +2/tex_offset = Vector2( 0, 0 ) +2/modulate = Color( 1, 1, 1, 1 ) +2/region = Rect2( 32, 0, 16, 16 ) +2/tile_mode = 0 +2/occluder_offset = Vector2( 0, 0 ) +2/navigation_offset = Vector2( 0, 0 ) +2/shape_offset = Vector2( 0, 0 ) +2/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +2/shape_one_way = false +2/shape_one_way_margin = 0.0 +2/shapes = [ ] +2/z_index = 0 +3/name = "ground_tileset.png 3" +3/texture = ExtResource( 1 ) +3/tex_offset = Vector2( 0, 0 ) +3/modulate = Color( 1, 1, 1, 1 ) +3/region = Rect2( 48, 0, 16, 16 ) +3/tile_mode = 0 +3/occluder_offset = Vector2( 0, 0 ) +3/navigation_offset = Vector2( 0, 0 ) +3/shape_offset = Vector2( 0, 0 ) +3/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +3/shape_one_way = false +3/shape_one_way_margin = 0.0 +3/shapes = [ ] +3/z_index = 0 +4/name = "ground_tileset.png 4" +4/texture = ExtResource( 1 ) +4/tex_offset = Vector2( 0, 0 ) +4/modulate = Color( 1, 1, 1, 1 ) +4/region = Rect2( 0, 16, 16, 16 ) +4/tile_mode = 0 +4/occluder_offset = Vector2( 0, 0 ) +4/navigation_offset = Vector2( 0, 0 ) +4/shape_offset = Vector2( 0, 0 ) +4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +4/shape_one_way = false +4/shape_one_way_margin = 0.0 +4/shapes = [ ] +4/z_index = 0 +5/name = "ground_tileset.png 5" +5/texture = ExtResource( 1 ) +5/tex_offset = Vector2( 0, 0 ) +5/modulate = Color( 1, 1, 1, 1 ) +5/region = Rect2( 16, 16, 16, 16 ) +5/tile_mode = 0 +5/occluder_offset = Vector2( 0, 0 ) +5/navigation_offset = Vector2( 0, 0 ) +5/shape_offset = Vector2( 0, 0 ) +5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +5/shape_one_way = false +5/shape_one_way_margin = 0.0 +5/shapes = [ ] +5/z_index = 0 +6/name = "ground_tileset.png 6" +6/texture = ExtResource( 1 ) +6/tex_offset = Vector2( 0, 0 ) +6/modulate = Color( 1, 1, 1, 1 ) +6/region = Rect2( 32, 16, 16, 16 ) +6/tile_mode = 0 +6/occluder_offset = Vector2( 0, 0 ) +6/navigation_offset = Vector2( 0, 0 ) +6/shape_offset = Vector2( 0, 0 ) +6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +6/shape_one_way = false +6/shape_one_way_margin = 0.0 +6/shapes = [ ] +6/z_index = 0 +7/name = "ground_tileset.png 7" +7/texture = ExtResource( 1 ) +7/tex_offset = Vector2( 0, 0 ) +7/modulate = Color( 1, 1, 1, 1 ) +7/region = Rect2( 48, 16, 16, 16 ) +7/tile_mode = 0 +7/occluder_offset = Vector2( 0, 0 ) +7/navigation_offset = Vector2( 0, 0 ) +7/shape_offset = Vector2( 0, 0 ) +7/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +7/shape_one_way = false +7/shape_one_way_margin = 0.0 +7/shapes = [ ] +7/z_index = 0 + +[sub_resource type="ConvexPolygonShape2D" id=2] +points = PoolVector2Array( 16, 16, 0, 16, 0, 0, 16, 0 ) + +[sub_resource type="TileSet" id=3] +0/name = "black.png 0" +0/texture = ExtResource( 2 ) +0/tex_offset = Vector2( 0, 0 ) +0/modulate = Color( 1, 1, 1, 1 ) +0/region = Rect2( 0, 0, 16, 16 ) +0/tile_mode = 0 +0/occluder_offset = Vector2( 0, 0 ) +0/navigation_offset = Vector2( 0, 0 ) +0/shape_offset = Vector2( 0, 0 ) +0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +0/shape = SubResource( 2 ) +0/shape_one_way = false +0/shape_one_way_margin = 1.0 +0/shapes = [ { "autotile_coord": Vector2( 0, 0 ), "one_way": false, "one_way_margin": 1.0, "shape": SubResource( 2 ), "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] -1/z_index = 0 +0/z_index = 0 [node name="WorldGenerator" type="Node2D"] script = ExtResource( 5 ) -[node name="TileMap" type="TileMap" parent="."] +[node name="GroundTileMap" type="TileMap" parent="."] tile_set = SubResource( 1 ) cell_size = Vector2( 16, 16 ) cell_quadrant_size = 4 format = 1 +[node name="WallTileMap" type="TileMap" parent="."] +tile_set = SubResource( 3 ) +cell_size = Vector2( 16, 16 ) +format = 1 + [node name="WalkerHead" parent="." instance=ExtResource( 4 )] -TILEMAP_NP = NodePath("../TileMap") +GROUND_TILEMAP_NP = NodePath("../GroundTileMap") +WALL_TILEMAP_NP = NodePath("../WallTileMap") WALKER_UNIT_NP = ExtResource( 3 ) [node name="Camera" type="Camera2D" parent="."] diff --git a/src/tools/world_generator/scripts/walker_head.gd b/src/tools/world_generator/scripts/walker_head.gd index 2ad9650..8bc5c4b 100644 --- a/src/tools/world_generator/scripts/walker_head.gd +++ b/src/tools/world_generator/scripts/walker_head.gd @@ -1,11 +1,13 @@ extends Node2D -export(NodePath) var TILEMAP_NP: NodePath +export(NodePath) var GROUND_TILEMAP_NP: NodePath +export(NodePath) var WALL_TILEMAP_NP: NodePath export(PackedScene) var WALKER_UNIT_NP: PackedScene export(int, 4, 100, 1) var STARTING_UNIT_COUNT: int = 6 export(int, 2, 10, 1) var INITIAL_SAFE_ZONE_SIZE: int = 2 -onready var tilemap: TileMap = get_node(TILEMAP_NP) +onready var ground_tilemap: TileMap = get_node(GROUND_TILEMAP_NP) +onready var wall_tilemap: TileMap = get_node(WALL_TILEMAP_NP) var max_x: int = 0 var max_y: int = 0 @@ -36,7 +38,11 @@ func _place_safe_zone() -> void: var size: int = INITIAL_SAFE_ZONE_SIZE for i in range(-size, size): for j in range(-size, size): - tilemap.set_cell(i, j, Global.WORLD_TILE_PATH) + ground_tilemap.set_cell(i, j, get_random_tile()) + + +func get_random_tile() -> int: + return randi() % Global.GROUND_TILE_AMOUNT func _spawn_walker_units() -> void: @@ -55,17 +61,18 @@ func _spawn_walker_unit(spawn_position: Vector2) -> void: func _fill_empty_space() -> void: var locations: Array = _get_empty_cells_location() for location in locations: - tilemap.set_cellv(location, Global.WORLD_TILE_WALL) + # doesn't matter which index is set, as long as its form the wall tilemap + wall_tilemap.set_cellv(location, 0) func _get_empty_cells_location() -> Array: var locations: Array = [] - var rect: Rect2 = tilemap.get_used_rect() + var rect: Rect2 = ground_tilemap.get_used_rect() var margin: int = map_margin for x in range(-margin, rect.size.x + margin): for y in range (-margin, rect.size.y + margin): var location: Vector2 = Vector2(rect.position.x + x, rect.position.y + y) - if tilemap.get_cell(int(location.x), int(location.y)) == TileMap.INVALID_CELL: + if ground_tilemap.get_cell(int(location.x), int(location.y)) == TileMap.INVALID_CELL: locations.append(location) return locations diff --git a/src/tools/world_generator/scripts/walker_unit.gd b/src/tools/world_generator/scripts/walker_unit.gd index cfa8f91..3107367 100644 --- a/src/tools/world_generator/scripts/walker_unit.gd +++ b/src/tools/world_generator/scripts/walker_unit.gd @@ -30,7 +30,7 @@ var walk_straight_length: float func start(id: int) -> void: Event.emit_signal("world_gen_walker_started", id) _walker_head = get_parent() - _tilemap = _walker_head.tilemap + _tilemap = _walker_head.ground_tilemap _randomize_stats() var path_steps: Array = _get_path_steps() @@ -70,11 +70,11 @@ func _set_path_tiles(path_steps: Array) -> bool: # get initial tile location var location: Vector2 = get_parent().global_position * Global.TILE_SIZE var move_direction: Vector2 - _set_tile(location, 0) + _set_tile(location, _walker_head.get_random_tile()) for step in path_steps: move_direction = direction[step] location += move_direction * Global.TILE_SIZE - _set_tile(location, Global.WORLD_TILE_PATH) + _set_tile(location, _walker_head.get_random_tile()) if randf() < birth_chance and not given_birth: Event.emit_signal("world_gen_spawn_walker_unit", location) diff --git a/src/tools/world_generator/scripts/world_generator.gd b/src/tools/world_generator/scripts/world_generator.gd index 5de84ea..cbc5dd5 100644 --- a/src/tools/world_generator/scripts/world_generator.gd +++ b/src/tools/world_generator/scripts/world_generator.gd @@ -1,16 +1,16 @@ extends Node2D -onready var tilemap: TileMap = $TileMap +onready var ground_tilemap: TileMap = $GroundTileMap onready var walker_head: Node2D = $WalkerHead func get_valid_map_coords() -> Array: var safe_area: Array = walker_head.get_cells_around() - var cells_used: Array = tilemap.get_used_cells_by_id(Global.WORLD_TILE_PATH) + var cells_used: Array = ground_tilemap.get_used_cells() for location in safe_area: cells_used.erase(location) return cells_used func get_centered_world_position(location: Vector2) -> Vector2: - return tilemap.map_to_world(location) + Vector2.ONE * Global.TILE_SIZE / 2.0 + return ground_tilemap.map_to_world(location) + Vector2.ONE * Global.TILE_SIZE / 2.0 diff --git a/src/tools/world_generator/sprites/ground_tileset.png b/src/tools/world_generator/sprites/ground_tileset.png Binary files differnew file mode 100644 index 0000000..cd9d696 --- /dev/null +++ b/src/tools/world_generator/sprites/ground_tileset.png diff --git a/src/tools/world_generator/sprites/ground_tileset.png.import b/src/tools/world_generator/sprites/ground_tileset.png.import new file mode 100644 index 0000000..28db0d2 --- /dev/null +++ b/src/tools/world_generator/sprites/ground_tileset.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/ground_tileset.png-7a8766cf1f87b69a9c1b072401597bed.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://tools/world_generator/sprites/ground_tileset.png" +dest_files=[ "res://.import/ground_tileset.png-7a8766cf1f87b69a9c1b072401597bed.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=false +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 |
