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

feat: Keep current animations resource (#459)

Browse Source 
Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
This commit is contained in:
Dennis Ploeger
2021-11-23 22:19:24 +01:00
committed by GitHub
parent 4f07278a73
commit 7963f03087
13 changed files with 374 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
game/rooms/room14/room14.tscn
View File

@@ -56,7 +56,7 @@ global_id = "r14_l_exit"
esc_script = "res://game/rooms/room14/esc/left_exit.esc"
is_exit = true
tooltip_name = "Left exit"
default_action = "use"
default_action = "walk"
dialog_color = Color( 1, 1, 1, 1 )
animations = null
@@ -71,7 +71,6 @@ global_id = "r12_l_exit"
[node name="r_door" parent="Hotspots" instance=ExtResource( 8 )]
global_id = "r14_r_exit"
esc_script = "res://game/rooms/room14/esc/right_exit.esc"
default_action = "use"
[node name="ESCLocation" type="Position2D" parent="Hotspots/r_door"]
position = Vector2( 1231.78, 360.624 )

3
game/rooms/room15/esc/switch_animation.esc Normal file
View File

@@ -0,0 +1,3 @@
:use
set_animations player res://game/characters/mark/mark_animations_weird.tres

12
game/rooms/room15/room15.tscn
View File

@@ -68,7 +68,7 @@ global_id = "r15_l_exit"
esc_script = "res://game/rooms/room15/esc/left_exit.esc"
is_exit = true
tooltip_name = "Left exit"
default_action = "use"
default_action = "walk"
dialog_color = Color( 1, 1, 1, 1 )
animations = null
@@ -83,7 +83,6 @@ global_id = "r12_l_exit"
[node name="r_door" parent="Hotspots" instance=ExtResource( 8 )]
global_id = "r15_r_exit"
esc_script = ""
default_action = "use"
[node name="ESCLocation" type="Position2D" parent="Hotspots/r_door"]
position = Vector2( 1231.78, 360.624 )
@@ -105,6 +104,15 @@ tooltip_name = "Say long test right"
[node name="Position2D" type="Position2D" parent="Hotspots/say_long"]
position = Vector2( 362.457, 358.656 )
[node name="switch_animation" parent="Hotspots" instance=ExtResource( 9 )]
position = Vector2( 510.195, 3.80031 )
global_id = "switch_animation"
esc_script = "res://game/rooms/room15/esc/switch_animation.esc"
tooltip_name = "Switch animation"
[node name="Position2D" type="Position2D" parent="Hotspots/switch_animation"]
position = Vector2( 362.457, 358.656 )
[node name="say_long_left" parent="Hotspots" instance=ExtResource( 9 )]
position = Vector2( -205.218, 2.85024 )
global_id = "say_long_left"