diff options
-rw-r--r-- | client/map/tiles/door.gd | 7 | ||||
-rw-r--r-- | client/map/tiles/tile.gd | 2 | ||||
-rw-r--r-- | data/maps/test.yaml | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/client/map/tiles/door.gd b/client/map/tiles/door.gd index 5d86c000..ab778158 100644 --- a/client/map/tiles/door.gd +++ b/client/map/tiles/door.gd @@ -14,7 +14,7 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. # class_name Door -extends Floor +extends WallTile func _init(rename: String, neighbors: Array): super(rename, neighbors) @@ -22,6 +22,7 @@ func _init(rename: String, neighbors: Array): var facing = 0 for i in range(4): if neighbors[i] == "door": - facing = i % 4 + facing = i + turn_facing(facing) base.add_child(load("res://map/tiles/door.tscn").instantiate()) - turn_facing(facing) + diff --git a/client/map/tiles/tile.gd b/client/map/tiles/tile.gd index 220a4395..6a73c596 100644 --- a/client/map/tiles/tile.gd +++ b/client/map/tiles/tile.gd @@ -41,7 +41,7 @@ func _init(rename: String, _neighbors: Array): item_base = item_base_ func turn_facing(facing: Facing): - base.rotate_y(facing * 0.5 * PI + PI) + base.rotation.y = facing * 0.5 * PI + PI # defines where items go when interacting static func interact_target() -> Vector3: diff --git a/data/maps/test.yaml b/data/maps/test.yaml index bb6137e5..ac43bb1d 100644 --- a/data/maps/test.yaml +++ b/data/maps/test.yaml @@ -16,9 +16,9 @@ map: - "*''''*'''*'''''*'''*'''*'''*''*'" - "'''*''''*'*'**'''*''**''**''*'''" - - "''██▒██▒██▒███▒███▒████▒██▒███*'" - - "''█ctc.ctc.ctc.ctc.ctc█s....#█**" - - "''█.....c.............█s.~..⌷█''" + - "''██▒██▒██▒███████▒████▒██▒███*'" + - "''█ctc.ctc.ctcdctc.ctc█s....#█**" + - "''█.....c.....d.......█s.~..⌷█''" - "'*▒c...c...████www██d██⌷⌷.⌷.⌷█*'" - "*'█tc.ctc..█#.....CC.>>>>.⌷.L█''" - "''▒c...c...w..⌷⌷.....<<<<...R█'*" |