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

Make ESCLocation is_start_location work (#421)

Browse Source 
Introducing BYPASS_LAST_ROOM global to allow changing scene without considering the previous room
Fixes godot-escoria/escoria-issues#40
This commit is contained in:
Julian Murgia
2021-10-26 16:36:02 +02:00
committed by GitHub
parent 2e87a2c1e6
commit 9dbcf2b58b
20 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
game/rooms/room01/esc/room01.esc
View File

@@ -4,9 +4,6 @@
# Set player look left
set_angle player 270
stop
> [!eq ESC_LAST_SCENE room2]
teleport player player_start
stop

4
game/rooms/room02/esc/room02_bridge.esc Executable file → Normal file
View File

@@ -26,10 +26,6 @@
#set_interactive r2_bridge false
stop
> [!last_scene]
teleport player player_start
stop
:ready

3
game/rooms/room03/esc/room03_bridge.esc
View File

@@ -29,9 +29,6 @@
> [!r3_bridge_closed]
set_interactive r3_right_platform false
stop
> [!last_scene]
teleport player player_start
stop
:ready

3
game/rooms/room04/esc/room04.esc Executable file → Normal file
View File

@@ -9,7 +9,4 @@
# Set player look left
set_angle player 270
stop
> [!last_scene]
teleport player player_start
stop

4
game/rooms/room05/esc/room05.esc Executable file → Normal file
View File

@@ -23,10 +23,6 @@
# Set player look left
set_angle player 270
stop
> [!last_scene]
teleport player player_start
set_angle player 90
stop
#walk player r5_wrench

3
game/rooms/room06/esc/room06.esc Executable file → Normal file
View File

@@ -9,9 +9,6 @@
# Set player look left
set_angle player 270
stop
> [!last_scene]
teleport player player_start
stop
#set_global i/r5_pen true
#set_active r5_pen false

3
game/rooms/room07/esc/room07.esc Executable file → Normal file
View File

@@ -16,8 +16,5 @@ set_state r7_button_zoom button_repaired true
# Set player look left
set_angle player 270
stop
> [!last_scene]
teleport player player_start
stop

3
game/rooms/room08/esc/room08.esc Executable file → Normal file
View File

@@ -13,7 +13,4 @@
# Set player look down
set_angle player 180
stop
> [!last_scene]
teleport player player_start
stop

3
game/rooms/room09/esc/room09.esc Executable file → Normal file
View File

@@ -18,8 +18,5 @@
# Set player look left
set_angle player 270
stop
> [!last_scene]
teleport player player_start
stop

3
game/rooms/room10/esc/room10.esc Executable file → Normal file
View File

@@ -10,7 +10,4 @@
# Set player look left
set_angle player 270
stop
> [!last_scene]
teleport player player_start
stop

3
game/rooms/room11/esc/room11.esc Executable file → Normal file
View File

@@ -12,7 +12,4 @@ set_state _music off false
# Set player look left
set_angle player 270
stop
> [!last_scene]
teleport player player_start
stop

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

@@ -11,9 +11,6 @@
# Set player look left
set_angle player 270
stop
> [!last_scene]
teleport player player_start
stop
:ready

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

@@ -90,4 +90,3 @@ position = Vector2( 340.052, 298.812 )
position = Vector2( 542.824, 468.193 )
script = ExtResource( 5 )
global_id = "player_start"
is_start_location = true

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

@@ -32,8 +32,7 @@ camera_limits = [ Rect2( 0, 0, 1289, 555 ) ]
margin_right = 92.0
margin_bottom = 21.0
custom_fonts/font = ExtResource( 3 )
text = "ROOM 12
"
text = "ROOM 13"
__meta__ = {
"_edit_use_anchors_": false
}