diff options
| -rw-r--r-- | client/scripts/map.gd | 2 | ||||
| -rw-r--r-- | client/scripts/tiles/chair.gd (renamed from client/scripts/map/chair.gd) | 0 | ||||
| -rw-r--r-- | client/scripts/tiles/counter.gd (renamed from client/scripts/map/counter.gd) | 0 | ||||
| -rw-r--r-- | client/scripts/tiles/counter_base.gd (renamed from client/scripts/map/counter_base.gd) | 0 | ||||
| -rw-r--r-- | client/scripts/tiles/cutting_board.gd (renamed from client/scripts/map/cutting_board.gd) | 0 | ||||
| -rw-r--r-- | client/scripts/tiles/door.gd | 12 | ||||
| -rw-r--r-- | client/scripts/tiles/floor.gd (renamed from client/scripts/map/floor.gd) | 0 | ||||
| -rw-r--r-- | client/scripts/tiles/full_tile.gd (renamed from client/scripts/map/full_tile.gd) | 0 | ||||
| -rw-r--r-- | client/scripts/tiles/oven.gd (renamed from client/scripts/map/oven.gd) | 0 | ||||
| -rw-r--r-- | client/scripts/tiles/sink.gd (renamed from client/scripts/map/sink.gd) | 0 | ||||
| -rw-r--r-- | client/scripts/tiles/stove.gd (renamed from client/scripts/map/stove.gd) | 0 | ||||
| -rw-r--r-- | client/scripts/tiles/table.gd (renamed from client/scripts/map/table.gd) | 0 | ||||
| -rw-r--r-- | client/scripts/tiles/trash.gd (renamed from client/scripts/map/trash.gd) | 0 | ||||
| -rw-r--r-- | client/scripts/tiles/wall.gd (renamed from client/scripts/map/wall.gd) | 0 | ||||
| -rw-r--r-- | client/scripts/tiles/wall_tile.gd (renamed from client/scripts/map/wall_tile.gd) | 0 | ||||
| -rw-r--r-- | client/scripts/tiles/window.gd | 11 |
16 files changed, 24 insertions, 1 deletions
diff --git a/client/scripts/map.gd b/client/scripts/map.gd index 83b61467..a88c8cdc 100644 --- a/client/scripts/map.gd +++ b/client/scripts/map.gd @@ -37,7 +37,7 @@ func update(pos, tile_name, neighbors): "window": instance = Wall.new() "door": - instance = Wall.new() + instance = Door.new() _: instance = Floor.new() diff --git a/client/scripts/map/chair.gd b/client/scripts/tiles/chair.gd index e51d7864..e51d7864 100644 --- a/client/scripts/map/chair.gd +++ b/client/scripts/tiles/chair.gd diff --git a/client/scripts/map/counter.gd b/client/scripts/tiles/counter.gd index d8b41804..d8b41804 100644 --- a/client/scripts/map/counter.gd +++ b/client/scripts/tiles/counter.gd diff --git a/client/scripts/map/counter_base.gd b/client/scripts/tiles/counter_base.gd index 19c7f045..19c7f045 100644 --- a/client/scripts/map/counter_base.gd +++ b/client/scripts/tiles/counter_base.gd diff --git a/client/scripts/map/cutting_board.gd b/client/scripts/tiles/cutting_board.gd index 0164036b..0164036b 100644 --- a/client/scripts/map/cutting_board.gd +++ b/client/scripts/tiles/cutting_board.gd diff --git a/client/scripts/tiles/door.gd b/client/scripts/tiles/door.gd new file mode 100644 index 00000000..a300977f --- /dev/null +++ b/client/scripts/tiles/door.gd @@ -0,0 +1,12 @@ +class_name Door +extends Floor + +func setup(rename: String, neighbors: Array): + super.setup(rename, neighbors) + + var facing = 0 + for i in range(4): + if tile_name(neighbors[i]) == "door": + facing = i % 4 + base.add_child(load("res://models/prefabs/map/door.tscn").instantiate()) + turn_facing(facing) diff --git a/client/scripts/map/floor.gd b/client/scripts/tiles/floor.gd index a8a396c4..a8a396c4 100644 --- a/client/scripts/map/floor.gd +++ b/client/scripts/tiles/floor.gd diff --git a/client/scripts/map/full_tile.gd b/client/scripts/tiles/full_tile.gd index a986b053..a986b053 100644 --- a/client/scripts/map/full_tile.gd +++ b/client/scripts/tiles/full_tile.gd diff --git a/client/scripts/map/oven.gd b/client/scripts/tiles/oven.gd index 2ebe7f33..2ebe7f33 100644 --- a/client/scripts/map/oven.gd +++ b/client/scripts/tiles/oven.gd diff --git a/client/scripts/map/sink.gd b/client/scripts/tiles/sink.gd index 2067cc33..2067cc33 100644 --- a/client/scripts/map/sink.gd +++ b/client/scripts/tiles/sink.gd diff --git a/client/scripts/map/stove.gd b/client/scripts/tiles/stove.gd index c2d75b7b..c2d75b7b 100644 --- a/client/scripts/map/stove.gd +++ b/client/scripts/tiles/stove.gd diff --git a/client/scripts/map/table.gd b/client/scripts/tiles/table.gd index 937ef097..937ef097 100644 --- a/client/scripts/map/table.gd +++ b/client/scripts/tiles/table.gd diff --git a/client/scripts/map/trash.gd b/client/scripts/tiles/trash.gd index 1ec05e49..1ec05e49 100644 --- a/client/scripts/map/trash.gd +++ b/client/scripts/tiles/trash.gd diff --git a/client/scripts/map/wall.gd b/client/scripts/tiles/wall.gd index dd6d3495..dd6d3495 100644 --- a/client/scripts/map/wall.gd +++ b/client/scripts/tiles/wall.gd diff --git a/client/scripts/map/wall_tile.gd b/client/scripts/tiles/wall_tile.gd index d107d73e..d107d73e 100644 --- a/client/scripts/map/wall_tile.gd +++ b/client/scripts/tiles/wall_tile.gd diff --git a/client/scripts/tiles/window.gd b/client/scripts/tiles/window.gd new file mode 100644 index 00000000..953f97db --- /dev/null +++ b/client/scripts/tiles/window.gd @@ -0,0 +1,11 @@ +class_name WallWindow +extends WallTile + +func setup(rename: String, neighbors: Array): + super.setup(rename, neighbors) + match kind: + WallKind.STRAIGHT: + base.add_child(load("res://models/prefabs/map/window.tscn").instantiate()) + WallKind.OUTER_CORNER: + push_warning("There is no corner window!") + base.add_child(load("res://models/prefabs/map/window.tscn").instantiate()) |