Skip to content

Commit

Permalink
fix: Debug message for when an item has no ESCLocation
Browse files Browse the repository at this point in the history
  • Loading branch information
Balloonpopper authored and StraToN committed Jan 19, 2023
1 parent 327b72f commit 1709a25
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
4 changes: 4 additions & 0 deletions addons/escoria-core/game/core-scripts/esc_item.gd
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,10 @@ func get_interact_position() -> Vector2:

if interact_position == null and collision != null:
interact_position = collision.global_position
escoria.logger.warn(
self,
"No ESClocation found to walk to for object " +
"%s. Middle of collision shape will be used." % global_id)

if multiple_positions_found:
escoria.logger.warn(
Expand Down
18 changes: 8 additions & 10 deletions game/rooms/room05/room05.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=15]

[sub_resource type="NavigationPolygon" id=1]
vertices = PoolVector2Array( 1187, 641, 1182.53, 588.863, 1269.59, 622.872, 1073, 686, 1267, 801, 1155, 615, 1067, 632, 15, 646, 93, 610, 96, 642, 857, 686, 15, 802, 12, 706, 129.634, 615.792, 857, 626 )
polygons = [ PoolIntArray( 0, 1, 2 ), PoolIntArray( 3, 0, 2, 4 ), PoolIntArray( 5, 0, 3, 6 ), PoolIntArray( 7, 8, 9 ), PoolIntArray( 10, 3, 4, 11, 12 ), PoolIntArray( 10, 12, 7, 9 ), PoolIntArray( 10, 9, 13, 14 ), PoolIntArray( 14, 13, 5 ), PoolIntArray( 14, 5, 6 ) ]
outlines = [ PoolVector2Array( 12, 706, 15, 646, 93, 610, 96, 642, 129.634, 615.792, 1155, 615, 1187, 641, 1182.53, 588.863, 1269.59, 622.872, 1267, 801, 15, 802 ), PoolVector2Array( 857, 626, 857, 686, 1073, 686, 1067, 632 ) ]
vertices = PoolVector2Array( 1187, 387, 1188, 352, 1269.59, 398, 1267, 538, 15, 401, 93, 350, 96, 375, 12, 539, 129.634, 362, 1155, 361 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6 ), PoolIntArray( 3, 7, 4, 6 ), PoolIntArray( 3, 6, 8, 9, 0 ) ]
outlines = [ PoolVector2Array( 12, 539, 15, 401, 93, 350, 96, 375, 129.634, 362, 1155, 361, 1187, 387, 1188, 352, 1269.59, 398, 1267, 538 ) ]

[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 36, 33.5 )
Expand Down Expand Up @@ -139,7 +139,6 @@ __meta__ = {
script = ExtResource( 1 )

[node name="platform" type="NavigationPolygonInstance" parent="walkable_area"]
position = Vector2( 1, -264 )
navpoly = SubResource( 1 )
__meta__ = {
"_editor_description_": ""
Expand Down Expand Up @@ -187,7 +186,6 @@ script = ExtResource( 11 )

[node name="pipe" type="Area2D" parent="Hotspots"]
pause_mode = 1
position = Vector2( -7, -1 )
script = ExtResource( 7 )
global_id = "r5_pipe"
esc_script = "res://game/rooms/room05/esc/pipe.esc"
Expand All @@ -198,7 +196,7 @@ dialog_color = Color( 1, 1, 1, 1 )
animations = null

[node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/pipe"]
position = Vector2( 618, 243.5 )
position = Vector2( 618, 243 )
shape = SubResource( 2 )

[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/pipe"]
Expand All @@ -213,19 +211,19 @@ process_material = SubResource( 5 )
texture = ExtResource( 9 )

[node name="ESCLocation" type="Position2D" parent="Hotspots/pipe"]
position = Vector2( 625, 393 )
position = Vector2( 618, 393 )
script = ExtResource( 11 )

[node name="wrench" parent="Hotspots" instance=ExtResource( 8 )]

[node name="paper" parent="Hotspots" instance=ExtResource( 2 )]
position = Vector2( 1005, 458 )
position = Vector2( 1005, 450 )

[node name="pen" parent="Hotspots" instance=ExtResource( 5 )]
position = Vector2( 916.266, 453.245 )
position = Vector2( 915, 450 )

[node name="player_start" type="Position2D" parent="."]
position = Vector2( 76.7617, 437.649 )
position = Vector2( 75, 450 )
script = ExtResource( 11 )
global_id = "r5_player_start"
is_start_location = true

0 comments on commit 1709a25

Please sign in to comment.