oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixed bug where walk action initiated by ESC would never call finished().

Browse Source 
Also removed call to inexisting function in ESCInventoryContainer.
This commit is contained in:
Julian Murgia
2021-01-28 13:32:14 +01:00
parent 14e85edba7
commit e6f4af74a8
51 changed files with 1515 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
game/rooms/room2/button/button.tscn Normal file
View File

@@ -0,0 +1,19 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/escitem.gd" type="Script" id=1]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 28.6442, 29.8513 )
[node name="button_right" type="Area2D"]
script = ExtResource( 1 )
tooltip_name = "Button"
default_action = "use"
dialog_color = Color( 1, 1, 1, 1 )
interact_positions = {
"default": Vector2( 971.212, 150.721 )
}
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2( 971.212, 150.721 )
shape = SubResource( 1 )

23
game/rooms/room2/room2.tscn
View File

@@ -84,16 +84,7 @@ position = Vector2( 52.1462, 384.691 )
global_id = "r2_button_right"
esc_script = "res://game/rooms/room2/esc/button.esc"
interact_positions = {
"default": Vector2( 971.212, 150.721 )
}
[node name="button_left" parent="Hotspots/button_right" instance=ExtResource( 5 )]
visible = false
position = Vector2( -625.523, 0 )
global_id = "r2_button"
esc_script = "res://game/rooms/room2/esc/button.esc"
interact_positions = {
"default": Vector2( 971.212, 150.721 )
"default": Vector2( 337.299, 370.025 )
}
[node name="Position2D" type="Position2D" parent="Hotspots/button_right"]
@@ -102,8 +93,16 @@ __meta__ = {
"_editor_description_": ""
}
[node name="Position2D2" type="Position2D" parent="Hotspots/button_right"]
position = Vector2( 337.299, 370.025 )
[node name="button_left" parent="Hotspots" instance=ExtResource( 5 )]
position = Vector2( -625.523, 0 )
global_id = "r2_button"
esc_script = "res://game/rooms/room2/esc/button.esc"
interact_positions = {
"default": Vector2( 345.689, 150.721 )
}
[node name="Position2D" type="Position2D" parent="Hotspots/button_left"]
position = Vector2( 962.822, 370.025 )
__meta__ = {
"_editor_description_": ""
}