diff options
| author | nokoe <nokoe@mailbox.org> | 2024-06-24 20:12:18 +0200 |
|---|---|---|
| committer | nokoe <nokoe@mailbox.org> | 2024-06-24 20:12:18 +0200 |
| commit | 9e0131dcf5c1d1694fc7d81faba6b3a7251ee71e (patch) | |
| tree | f173294ca3cb88a26a9cc1a3d6ccd0884cf49824 /client/map/tiles | |
| parent | 3e483fbbc2c7aa5cce7f31adc31d2cba15f9c08a (diff) | |
| parent | dbb52c813e64fbe4e733dbfec4e29889d288873e (diff) | |
| download | hurrycurry-9e0131dcf5c1d1694fc7d81faba6b3a7251ee71e.tar hurrycurry-9e0131dcf5c1d1694fc7d81faba6b3a7251ee71e.tar.bz2 hurrycurry-9e0131dcf5c1d1694fc7d81faba6b3a7251ee71e.tar.zst | |
Merge branch 'master' of ssh://codeberg.org/metamuffin/undercooked
Diffstat (limited to 'client/map/tiles')
| -rw-r--r-- | client/map/tiles/chair.gd | 2 | ||||
| -rw-r--r-- | client/map/tiles/counter.gd | 4 | ||||
| -rw-r--r-- | client/map/tiles/door.gd | 2 | ||||
| -rw-r--r-- | client/map/tiles/floor.gd | 6 | ||||
| -rw-r--r-- | client/map/tiles/wall_tile.gd | 2 |
5 files changed, 5 insertions, 11 deletions
diff --git a/client/map/tiles/chair.gd b/client/map/tiles/chair.gd index a821ac80..b7014028 100644 --- a/client/map/tiles/chair.gd +++ b/client/map/tiles/chair.gd @@ -21,7 +21,7 @@ func _init(rename: String, neighbors: Array): var chair = load("res://map/tiles/chair.tscn").instantiate() var facing = 0; for i in range(4): - if tile_name(neighbors[i]) == "table": + if neighbors[i] == "table": facing = i break base.add_child(chair) diff --git a/client/map/tiles/counter.gd b/client/map/tiles/counter.gd index 6783d486..62868087 100644 --- a/client/map/tiles/counter.gd +++ b/client/map/tiles/counter.gd @@ -43,7 +43,7 @@ func _init(rename: String, neighbors: Array): for start in range(4): var series = 0 for i in range(4): - if tile_name(neighbors[(start + i) % 4]) == "floor": + if neighbors[(start + i) % 4] == "floor": series += 1 else: break @@ -55,7 +55,7 @@ func _init(rename: String, neighbors: Array): # backsplash facing = max_idx if max_series == 1: - if WallTile.is_wall(tile_name(neighbors[(max_idx + 2) % 4])): + if WallTile.is_wall(neighbors[(max_idx + 2) % 4]): kind = CounterKind.STRAIGHT_BACKSPLASH else: kind = CounterKind.STRAIGHT diff --git a/client/map/tiles/door.gd b/client/map/tiles/door.gd index 79f6ee85..5d86c000 100644 --- a/client/map/tiles/door.gd +++ b/client/map/tiles/door.gd @@ -21,7 +21,7 @@ func _init(rename: String, neighbors: Array): var facing = 0 for i in range(4): - if tile_name(neighbors[i]) == "door": + if neighbors[i] == "door": facing = i % 4 base.add_child(load("res://map/tiles/door.tscn").instantiate()) turn_facing(facing) diff --git a/client/map/tiles/floor.gd b/client/map/tiles/floor.gd index 2433849d..c5089feb 100644 --- a/client/map/tiles/floor.gd +++ b/client/map/tiles/floor.gd @@ -46,12 +46,6 @@ func _init(rename: String, _neighbors: Array): func turn_facing(facing: Facing): base.rotate_y(facing * 0.5 * PI + PI) -func tile_name(idx): - if idx == null: - return null - return Multiplayer.tile_names[idx] - - # defines where items go when interacting static func interact_target() -> Vector3: return Vector3(0, 0, 0) diff --git a/client/map/tiles/wall_tile.gd b/client/map/tiles/wall_tile.gd index 85e3e6ff..08d3c080 100644 --- a/client/map/tiles/wall_tile.gd +++ b/client/map/tiles/wall_tile.gd @@ -40,7 +40,7 @@ func _init(rename: String, neighbors: Array): for start in range(4): var series = 0 for i in range(4): - var i_name = tile_name(neighbors[(start + i) % 4]) + var i_name = neighbors[(start + i) % 4] if is_wall(i_name): series += 1 else: |