Skip to content

Commit 1b5b7a7

Browse files
committed
Increase space between areas, move to next area on core cell collision
1 parent 350d793 commit 1b5b7a7

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

game/area/area.gd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ var grid_position := Vector2i.ZERO
2727

2828
func _ready() -> void:
2929
west_creation_area.body_entered.connect(_on_creation_area_body_entered.bind(&"west", west_creation_area))
30-
west_transport_area.body_entered.connect(_on_transport_area_body_entered.bind(&"west"))
30+
west_transport_area.area_entered.connect(_on_transport_area_body_entered.bind(&"west"))
3131

3232
east_creation_area.body_entered.connect(_on_creation_area_body_entered.bind(&"east", east_creation_area))
33-
east_transport_area.body_entered.connect(_on_transport_area_body_entered.bind(&"east"))
33+
east_transport_area.area_entered.connect(_on_transport_area_body_entered.bind(&"east"))
3434

3535
north_creation_area.body_entered.connect(_on_creation_area_body_entered.bind(&"north", north_creation_area))
36-
north_transport_area.body_entered.connect(_on_transport_area_body_entered.bind(&"north"))
36+
north_transport_area.area_entered.connect(_on_transport_area_body_entered.bind(&"north"))
3737

3838
south_creation_area.body_entered.connect(_on_creation_area_body_entered.bind(&"south", south_creation_area))
39-
south_transport_area.body_entered.connect(_on_transport_area_body_entered.bind(&"south"))
39+
south_transport_area.area_entered.connect(_on_transport_area_body_entered.bind(&"south"))
4040

4141

42-
func _on_transport_area_body_entered(_body: Node2D, side: StringName) -> void:
42+
func _on_transport_area_body_entered(_area: Area2D, side: StringName) -> void:
4343
transport_requested.emit(self, side)
4444

4545

game/area/area.tscn

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ shape = SubResource("RectangleShape2D_fafbg")
8686
[node name="WestTransportArea" type="Area2D" parent="Transport" unique_id=605026687]
8787
position = Vector2(-1218, 0)
8888
collision_layer = 0
89-
collision_mask = 2
89+
collision_mask = 16
9090

9191
[node name="CollisionShape2D" type="CollisionShape2D" parent="Transport/WestTransportArea" unique_id=2039810326]
9292
shape = SubResource("RectangleShape2D_fafbg")
9393

9494
[node name="EastTransportArea" type="Area2D" parent="Transport" unique_id=1470922658]
9595
position = Vector2(1232, 0)
9696
collision_layer = 0
97-
collision_mask = 2
97+
collision_mask = 16
9898

9999
[node name="CollisionShape2D" type="CollisionShape2D" parent="Transport/EastTransportArea" unique_id=1089216346]
100100
position = Vector2(-18, 1.25)
@@ -104,7 +104,7 @@ shape = SubResource("RectangleShape2D_fafbg")
104104
position = Vector2(0, -1239)
105105
rotation = 1.5707964
106106
collision_layer = 0
107-
collision_mask = 2
107+
collision_mask = 16
108108

109109
[node name="CollisionShape2D" type="CollisionShape2D" parent="Transport/NorthTransportArea" unique_id=1844721722]
110110
position = Vector2(25, 1.25)
@@ -114,7 +114,7 @@ shape = SubResource("RectangleShape2D_fafbg")
114114
position = Vector2(1, 1213)
115115
rotation = 1.5707964
116116
collision_layer = 0
117-
collision_mask = 2
117+
collision_mask = 16
118118

119119
[node name="CollisionShape2D" type="CollisionShape2D" parent="Transport/SouthTransportArea" unique_id=1119681408]
120120
position = Vector2(1, 1.25)

game/game_area/game_area.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class_name GameArea
22
extends Node2D
33

4-
const ROOM_SPACING = 3000
4+
const ROOM_SPACING = 3250
55
const AREA = preload("uid://b8s7r2s04sqw3")
66

77
@onready var area: ArenaArea = $Area

0 commit comments

Comments
 (0)