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

feat: This enables user-defined transition and uses a tween to animate the transitions (#405)

Browse Source 
* feat: This enables user-defined transition and uses a tween to animate the transitions

fixes #344

* docs: Automatic update of API docs

* docs: Automatic update of API docs

Co-authored-by: Dennis Ploeger <develop@dieploegers.de>
Co-authored-by: dploeger <dploeger@users.noreply.github.com>
This commit is contained in:
Dennis Ploeger
2021-09-28 11:30:40 +02:00
committed by GitHub
parent b710def99d
commit df78b52b8a
28 changed files with 323 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game/rooms/room02/room02.tscn
View File

@@ -90,6 +90,7 @@ position = Vector2( 958.107, 176.401 )
global_id = "r2_button_right"
esc_script = "res://game/rooms/room02/esc/button.esc"
dialog_color = Color( 0, 1, 0.109804, 1 )
animations = null
[node name="Position2D" type="Position2D" parent="button_right"]
position = Vector2( 29.4302, 195.411 )
@@ -104,6 +105,7 @@ position = Vector2( 288.82, 171.439 )
global_id = "r2_button"
esc_script = "res://game/rooms/room02/esc/button.esc"
dialog_color = Color( 0, 1, 0.109804, 1 )
animations = null
[node name="Position2D" type="Position2D" parent="button_left"]
position = Vector2( 24.6681, 196.998 )

31
game/rooms/room12/esc/button.esc Normal file
View File

@@ -0,0 +1,31 @@
:use
say player "Default"
transition "" out
wait 1
transition "" in
say player "Fade white"
transition fade_white out
wait 1
transition fade_white in
say player "Fade black"
transition fade_black out
wait 1
transition fade_black in
say player "From Center"
transition from_center out
wait 1
transition from_center in
say player "Shards"
transition shards out
wait 1
transition shards in
say player "Blackout"
transition fade_black out 0.0
wait 1
transition fade_black in 0.0

4
game/rooms/room12/esc/room12.esc
View File

@@ -17,7 +17,3 @@
:ready
transition fade_white in
wait 2
transition fade_white out

13
game/rooms/room12/room12.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=10 format=2]
[gd_scene load_steps=11 format=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1]
[ext_resource path="res://game/rooms/room12/background.tscn" type="PackedScene" id=2]
@@ -8,6 +8,7 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=7]
[ext_resource path="res://game/rooms/room12/r_door.tscn" type="PackedScene" id=8]
[ext_resource path="res://game/items/escitems/button.tscn" type="PackedScene" id=9]
[sub_resource type="NavigationPolygon" id=1]
vertices = PoolVector2Array( 1168.92, 640.557, 1182.53, 588.863, 1269.59, 622.872, 1275.03, 799.721, 864.626, 613.518, 1143.08, 613.35, -9.16094, 803.802, 386.666, 618.012, 129.634, 615.792, 84.5821, 654.06, -6.44019, 711.297, 3.15687, 646.051, 59.2201, 628.698 )
@@ -75,6 +76,16 @@ esc_script = "res://game/rooms/room12/esc/right_exit.esc"
position = Vector2( 1231.78, 360.624 )
script = ExtResource( 5 )
[node name="button" parent="Hotspots" instance=ExtResource( 9 )]
pause_mode = 1
position = Vector2( 301.706, 73.0751 )
global_id = "r12_button"
esc_script = "res://game/rooms/room12/esc/button.esc"
animations = null
[node name="Position2D" type="Position2D" parent="Hotspots/button"]
position = Vector2( 340.052, 298.812 )
[node name="player_start" type="Position2D" parent="."]
position = Vector2( 542.824, 468.193 )
script = ExtResource( 5 )