Better base tiles. Also fix spawning.

This commit is contained in:
Relintai 2021-05-23 10:04:36 +02:00
parent a3e86850b4
commit 8083530e0a
4 changed files with 366 additions and 5 deletions

View File

@ -33,7 +33,7 @@ var _editor_generate : bool
var _player : Entity var _player : Entity
enum Tile { Floor, Wall, Door, Ladder, Stone } enum Tile { Floor = 19, Wall = 13, Door = 15, Ladder = 14, Stone = 13 }
var tile_size : int = 32 var tile_size : int = 32
export(Vector2) var level_size : Vector2 = Vector2(40, 40) export(Vector2) var level_size : Vector2 = Vector2(40, 40)
@ -54,7 +54,8 @@ onready var tile_map : TileMap = $Terrarin
onready var visibility_map : TileMap = $VisibilityMap onready var visibility_map : TileMap = $VisibilityMap
func _ready(): func _ready():
tile_size = get_node("/root/Main").get_tile_size() # tile_size = get_node("/root/Main").get_tile_size()
tile_size = 8
connect("visibility_changed", self, "on_visibility_changed") connect("visibility_changed", self, "on_visibility_changed")
func place_player(player: Entity) -> void: func place_player(player: Entity) -> void:

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,83 @@
[gd_resource type="TileSet" load_steps=2 format=2] [gd_resource type="TileSet" load_steps=24 format=2]
[ext_resource path="res://tilesets/db32/db32_merged.png" type="Texture" id=1] [ext_resource path="res://tilesets/db32/db32_merged.png" type="Texture" id=1]
[sub_resource type="NavigationPolygon" id=15]
vertices = PoolVector2Array( 0, 0, 8, 0, 8, 4.9949, 0, 4.9949 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ) ]
[sub_resource type="ConvexPolygonShape2D" id=5]
points = PoolVector2Array( 0, 5.08838, 8, 5.08838, 8, 8, 0, 8 )
[sub_resource type="NavigationPolygon" id=16]
vertices = PoolVector2Array( 0, 0, 4.90746, 0, 4.90746, 4.80798, 0, 4.80798 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ) ]
[sub_resource type="ConvexPolygonShape2D" id=9]
points = PoolVector2Array( 8, 0, 8, 8, 0, 8, 0, 4.90144, 5.00092, 4.90144, 5.00092, 0 )
[sub_resource type="NavigationPolygon" id=18]
vertices = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ) ]
[sub_resource type="OccluderPolygon2D" id=20]
polygon = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 )
[sub_resource type="ConvexPolygonShape2D" id=2]
points = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 )
[sub_resource type="OccluderPolygon2D" id=21]
polygon = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 )
[sub_resource type="ConvexPolygonShape2D" id=1]
points = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 )
[sub_resource type="OccluderPolygon2D" id=22]
polygon = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 )
[sub_resource type="ConvexPolygonShape2D" id=3]
points = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 )
[sub_resource type="NavigationPolygon" id=19]
vertices = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ) ]
[sub_resource type="NavigationPolygon" id=10]
vertices = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ) ]
[sub_resource type="NavigationPolygon" id=11]
vertices = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ) ]
[sub_resource type="NavigationPolygon" id=12]
vertices = PoolVector2Array( 3.18658, 3.15311, 8, 3.15311, 8, 8, 3.18658, 8 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ) ]
[sub_resource type="ConvexPolygonShape2D" id=7]
points = PoolVector2Array( 0, 8, 0, 0, 8, 0, 8, 3.15311, 3.18658, 3.05965, 3.18658, 8 )
[sub_resource type="NavigationPolygon" id=13]
vertices = PoolVector2Array( 0, 3.15311, 8, 3.05965, 8, 8, 0, 8 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ) ]
[sub_resource type="ConvexPolygonShape2D" id=4]
points = PoolVector2Array( 0, 0, 8, 0, 8, 3.05965, 0, 3.15311 )
[sub_resource type="NavigationPolygon" id=14]
vertices = PoolVector2Array( 0, 3.05965, 4.90746, 3.05965, 5.00092, 8, 0, 8 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ) ]
[sub_resource type="ConvexPolygonShape2D" id=8]
points = PoolVector2Array( 0, 0, 8, 0, 8, 8, 5.00092, 8, 5.00092, 3.05965, 0.140808, 3.15311 )
[sub_resource type="NavigationPolygon" id=17]
vertices = PoolVector2Array( 3.09312, 0, 8, 0, 8, 4.71451, 3.09312, 4.80798 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ) ]
[sub_resource type="ConvexPolygonShape2D" id=6]
points = PoolVector2Array( 3.09312, 0, 2.99966, 5.18185, 8, 5.08838, 8, 7.98575, 0, 8, 0, 0 )
[resource] [resource]
0/name = "db32_merged.png 0" 0/name = "db32_merged.png 0"
0/texture = ExtResource( 1 ) 0/texture = ExtResource( 1 )
@ -87,3 +163,289 @@
5/shape_one_way_margin = 0.0 5/shape_one_way_margin = 0.0
5/shapes = [ ] 5/shapes = [ ]
5/z_index = 0 5/z_index = 0
6/name = "db32_merged.png 6"
6/texture = ExtResource( 1 )
6/tex_offset = Vector2( 0, 0 )
6/modulate = Color( 1, 1, 1, 1 )
6/region = Rect2( 130, 192, 8, 8 )
6/tile_mode = 0
6/occluder_offset = Vector2( 0, 0 )
6/navigation_offset = Vector2( 0, 0 )
6/navigation = SubResource( 12 )
6/shape_offset = Vector2( 0, 0 )
6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
6/shape = SubResource( 7 )
6/shape_one_way = false
6/shape_one_way_margin = 1.0
6/shapes = [ {
"autotile_coord": Vector2( 0, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 7 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
6/z_index = 0
7/name = "db32_merged.png 7"
7/texture = ExtResource( 1 )
7/tex_offset = Vector2( 0, 0 )
7/modulate = Color( 1, 1, 1, 1 )
7/region = Rect2( 139, 192, 8, 8 )
7/tile_mode = 0
7/occluder_offset = Vector2( 0, 0 )
7/navigation_offset = Vector2( 0, 0 )
7/navigation = SubResource( 13 )
7/shape_offset = Vector2( 0, 0 )
7/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
7/shape = SubResource( 4 )
7/shape_one_way = false
7/shape_one_way_margin = 1.0
7/shapes = [ {
"autotile_coord": Vector2( 0, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 4 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
7/z_index = 0
8/name = "db32_merged.png 8"
8/texture = ExtResource( 1 )
8/tex_offset = Vector2( 0, 0 )
8/modulate = Color( 1, 1, 1, 1 )
8/region = Rect2( 148, 192, 8, 8 )
8/tile_mode = 0
8/occluder_offset = Vector2( 0, 0 )
8/navigation_offset = Vector2( 0, 0 )
8/navigation = SubResource( 14 )
8/shape_offset = Vector2( 0, 0 )
8/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
8/shape = SubResource( 8 )
8/shape_one_way = false
8/shape_one_way_margin = 1.0
8/shapes = [ {
"autotile_coord": Vector2( 0, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 8 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
8/z_index = 0
9/name = "db32_merged.png 9"
9/texture = ExtResource( 1 )
9/tex_offset = Vector2( 0, 0 )
9/modulate = Color( 1, 1, 1, 1 )
9/region = Rect2( 130, 201, 8, 8 )
9/tile_mode = 0
9/occluder_offset = Vector2( 0, 0 )
9/navigation_offset = Vector2( 0, 0 )
9/navigation = SubResource( 17 )
9/shape_offset = Vector2( 0, 0 )
9/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
9/shape = SubResource( 6 )
9/shape_one_way = false
9/shape_one_way_margin = 1.0
9/shapes = [ {
"autotile_coord": Vector2( 0, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 6 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
9/z_index = 0
10/name = "db32_merged.png 10"
10/texture = ExtResource( 1 )
10/tex_offset = Vector2( 0, 0 )
10/modulate = Color( 1, 1, 1, 1 )
10/region = Rect2( 139, 201, 8, 8 )
10/tile_mode = 0
10/occluder_offset = Vector2( 0, 0 )
10/navigation_offset = Vector2( 0, 0 )
10/navigation = SubResource( 15 )
10/shape_offset = Vector2( 0, 0 )
10/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
10/shape = SubResource( 5 )
10/shape_one_way = false
10/shape_one_way_margin = 1.0
10/shapes = [ {
"autotile_coord": Vector2( 0, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 5 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
10/z_index = 0
11/name = "db32_merged.png 11"
11/texture = ExtResource( 1 )
11/tex_offset = Vector2( 0, 0 )
11/modulate = Color( 1, 1, 1, 1 )
11/region = Rect2( 148, 201, 8, 8 )
11/tile_mode = 0
11/occluder_offset = Vector2( 0, 0 )
11/navigation_offset = Vector2( 0, 0 )
11/navigation = SubResource( 16 )
11/shape_offset = Vector2( 0, 0 )
11/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
11/shape = SubResource( 9 )
11/shape_one_way = false
11/shape_one_way_margin = 1.0
11/shapes = [ {
"autotile_coord": Vector2( 0, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 9 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
11/z_index = 0
12/name = "db32_merged.png 12"
12/texture = ExtResource( 1 )
12/tex_offset = Vector2( 0, 0 )
12/modulate = Color( 1, 1, 1, 1 )
12/region = Rect2( 157, 192, 8, 8 )
12/tile_mode = 0
12/occluder_offset = Vector2( 0, 0 )
12/navigation_offset = Vector2( 0, 0 )
12/navigation = SubResource( 18 )
12/shape_offset = Vector2( 0, 0 )
12/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
12/shape_one_way = false
12/shape_one_way_margin = 0.0
12/shapes = [ ]
12/z_index = 0
13/name = "db32_merged.png 13"
13/texture = ExtResource( 1 )
13/tex_offset = Vector2( 0, 0 )
13/modulate = Color( 1, 1, 1, 1 )
13/region = Rect2( 139, 210, 8, 8 )
13/tile_mode = 0
13/occluder_offset = Vector2( 0, 0 )
13/occluder = SubResource( 20 )
13/navigation_offset = Vector2( 0, 0 )
13/shape_offset = Vector2( 0, 0 )
13/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
13/shape = SubResource( 2 )
13/shape_one_way = false
13/shape_one_way_margin = 1.0
13/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 )
} ]
13/z_index = 0
14/name = "db32_merged.png 14"
14/texture = ExtResource( 1 )
14/tex_offset = Vector2( 0, 0 )
14/modulate = Color( 1, 1, 1, 1 )
14/region = Rect2( 121, 228, 8, 8 )
14/tile_mode = 0
14/occluder_offset = Vector2( 0, 0 )
14/navigation_offset = Vector2( 0, 0 )
14/shape_offset = Vector2( 0, 0 )
14/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
14/shape_one_way = false
14/shape_one_way_margin = 0.0
14/shapes = [ ]
14/z_index = 0
15/name = "db32_merged.png 15"
15/texture = ExtResource( 1 )
15/tex_offset = Vector2( 0, 0 )
15/modulate = Color( 1, 1, 1, 1 )
15/region = Rect2( 130, 228, 8, 8 )
15/tile_mode = 0
15/occluder_offset = Vector2( 0, 0 )
15/navigation_offset = Vector2( 0, 0 )
15/shape_offset = Vector2( 0, 0 )
15/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
15/shape_one_way = false
15/shape_one_way_margin = 0.0
15/shapes = [ ]
15/z_index = 0
16/name = "db32_merged.png 16"
16/texture = ExtResource( 1 )
16/tex_offset = Vector2( 0, 0 )
16/modulate = Color( 1, 1, 1, 1 )
16/region = Rect2( 130, 210, 8, 8 )
16/tile_mode = 0
16/occluder_offset = Vector2( 0, 0 )
16/occluder = SubResource( 21 )
16/navigation_offset = Vector2( 0, 0 )
16/shape_offset = Vector2( 0, 0 )
16/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
16/shape = SubResource( 1 )
16/shape_one_way = false
16/shape_one_way_margin = 1.0
16/shapes = [ {
"autotile_coord": Vector2( 0, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 1 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
16/z_index = 0
17/name = "db32_merged.png 17"
17/texture = ExtResource( 1 )
17/tex_offset = Vector2( 0, 0 )
17/modulate = Color( 1, 1, 1, 1 )
17/region = Rect2( 148, 210, 8, 8 )
17/tile_mode = 0
17/occluder_offset = Vector2( 0, 0 )
17/occluder = SubResource( 22 )
17/navigation_offset = Vector2( 0, 0 )
17/shape_offset = Vector2( 0, 0 )
17/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
17/shape = SubResource( 3 )
17/shape_one_way = false
17/shape_one_way_margin = 1.0
17/shapes = [ {
"autotile_coord": Vector2( 0, 0 ),
"one_way": false,
"one_way_margin": 1.0,
"shape": SubResource( 3 ),
"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
} ]
17/z_index = 0
18/name = "db32_merged.png 18"
18/texture = ExtResource( 1 )
18/tex_offset = Vector2( 0, 0 )
18/modulate = Color( 1, 1, 1, 1 )
18/region = Rect2( 157, 201, 8, 8 )
18/tile_mode = 0
18/occluder_offset = Vector2( 0, 0 )
18/navigation_offset = Vector2( 0, 0 )
18/navigation = SubResource( 19 )
18/shape_offset = Vector2( 0, 0 )
18/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
18/shape_one_way = false
18/shape_one_way_margin = 0.0
18/shapes = [ ]
18/z_index = 0
19/name = "db32_merged.png 19"
19/texture = ExtResource( 1 )
19/tex_offset = Vector2( 0, 0 )
19/modulate = Color( 1, 1, 1, 1 )
19/region = Rect2( 112, 192, 8, 8 )
19/tile_mode = 0
19/occluder_offset = Vector2( 0, 0 )
19/navigation_offset = Vector2( 0, 0 )
19/navigation = SubResource( 10 )
19/shape_offset = Vector2( 0, 0 )
19/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
19/shape_one_way = false
19/shape_one_way_margin = 0.0
19/shapes = [ ]
19/z_index = 0
20/name = "db32_merged.png 20"
20/texture = ExtResource( 1 )
20/tex_offset = Vector2( 0, 0 )
20/modulate = Color( 1, 1, 1, 1 )
20/region = Rect2( 121, 192, 8, 8 )
20/tile_mode = 0
20/occluder_offset = Vector2( 0, 0 )
20/navigation_offset = Vector2( 0, 0 )
20/navigation = SubResource( 11 )
20/shape_offset = Vector2( 0, 0 )
20/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
20/shape_one_way = false
20/shape_one_way_margin = 0.0
20/shapes = [ ]
20/z_index = 0

File diff suppressed because one or more lines are too long