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

fix: change hotspots Node to Node2D to allow for proper room visibility swapping

Browse Source
This commit is contained in:
Duncan Brown
2022-04-13 15:54:47 -04:00
committed by Julian Murgia
parent 4b3b96b688
commit b985c42e08
6 changed files with 222 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
game/rooms/intro/intro_room.tscn
View File

@@ -8,45 +8,45 @@
[ext_resource path="res://game/rooms/intro/escoria_background.png" type="Texture" id=6] [ext_resource path="res://game/rooms/intro/escoria_background.png" type="Texture" id=6]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=7] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=7]
[sub_resource type="AtlasTexture" id=9] [sub_resource type="AtlasTexture" id=1]
flags = 4 flags = 4
atlas = ExtResource( 1 ) atlas = ExtResource( 1 )
region = Rect2( 0, 0, 340, 400 ) region = Rect2( 0, 0, 340, 400 )
[sub_resource type="AtlasTexture" id=10] [sub_resource type="AtlasTexture" id=2]
flags = 4 flags = 4
atlas = ExtResource( 1 ) atlas = ExtResource( 1 )
region = Rect2( 340, 0, 340, 400 ) region = Rect2( 340, 0, 340, 400 )
[sub_resource type="AtlasTexture" id=11] [sub_resource type="AtlasTexture" id=3]
flags = 4 flags = 4
atlas = ExtResource( 1 ) atlas = ExtResource( 1 )
region = Rect2( 680, 0, 340, 400 ) region = Rect2( 680, 0, 340, 400 )
[sub_resource type="AtlasTexture" id=12] [sub_resource type="AtlasTexture" id=4]
flags = 4 flags = 4
atlas = ExtResource( 1 ) atlas = ExtResource( 1 )
region = Rect2( 1020, 0, 340, 400 ) region = Rect2( 1020, 0, 340, 400 )
[sub_resource type="AtlasTexture" id=13] [sub_resource type="AtlasTexture" id=5]
flags = 4 flags = 4
atlas = ExtResource( 1 ) atlas = ExtResource( 1 )
region = Rect2( 1360, 0, 340, 400 ) region = Rect2( 1360, 0, 340, 400 )
[sub_resource type="AtlasTexture" id=14] [sub_resource type="AtlasTexture" id=6]
flags = 4 flags = 4
atlas = ExtResource( 1 ) atlas = ExtResource( 1 )
region = Rect2( 1700, 0, 340, 400 ) region = Rect2( 1700, 0, 340, 400 )
[sub_resource type="SpriteFrames" id=8] [sub_resource type="SpriteFrames" id=7]
animations = [ { animations = [ {
"frames": [ SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ) ], "frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ) ],
"loop": true, "loop": true,
"name": "default", "name": "default",
"speed": 10.0 "speed": 10.0
} ] } ]
[sub_resource type="Animation" id=1] [sub_resource type="Animation" id=8]
length = 0.1 length = 0.1
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("asteroid:visible") tracks/0/path = NodePath("asteroid:visible")
@@ -121,8 +121,7 @@ tracks/5/keys = {
"values": [ true ] "values": [ true ]
} }
[sub_resource type="Animation" id=2] [sub_resource type="Animation" id=9]
resource_name = "intro"
length = 6.0 length = 6.0
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("animated_asteroid:position") tracks/0/path = NodePath("animated_asteroid:position")
@@ -279,8 +278,8 @@ texture = ExtResource( 2 )
[node name="animated_asteroid" type="AnimatedSprite" parent="."] [node name="animated_asteroid" type="AnimatedSprite" parent="."]
visible = false visible = false
position = Vector2( 630, 471 ) position = Vector2( 630, 471 )
frames = SubResource( 8 ) frames = SubResource( 7 )
frame = 5 frame = 1
playing = true playing = true
[node name="Polygon2D" type="Polygon2D" parent="."] [node name="Polygon2D" type="Polygon2D" parent="."]
@@ -303,5 +302,5 @@ animations = null
[node name="AnimationPlayer" type="AnimationPlayer" parent="ESCItem"] [node name="AnimationPlayer" type="AnimationPlayer" parent="ESCItem"]
root_node = NodePath("../..") root_node = NodePath("../..")
anims/RESET = SubResource( 1 ) anims/RESET = SubResource( 8 )
anims/intro = SubResource( 2 ) anims/intro = SubResource( 9 )

16
game/rooms/room05/room05.tscn
View File

@@ -18,10 +18,10 @@ vertices = PoolVector2Array( 1187, 641, 1182.53, 588.863, 1269.59, 622.872, 1267
polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6, 7, 8 ), PoolIntArray( 9, 10, 0, 3, 8, 7 ) ] polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6, 7, 8 ), PoolIntArray( 9, 10, 0, 3, 8, 7 ) ]
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 ) ] 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 ) ]
[sub_resource type="RectangleShape2D" id=5] [sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 36, 33.5 ) extents = Vector2( 36, 33.5 )
[sub_resource type="Animation" id=7] [sub_resource type="Animation" id=3]
resource_name = "start_water" resource_name = "start_water"
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("Particles2D:emitting") tracks/0/path = NodePath("Particles2D:emitting")
@@ -36,7 +36,7 @@ tracks/0/keys = {
"values": [ true ] "values": [ true ]
} }
[sub_resource type="Animation" id=8] [sub_resource type="Animation" id=4]
resource_name = "stop_water" resource_name = "stop_water"
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("Particles2D:emitting") tracks/0/path = NodePath("Particles2D:emitting")
@@ -51,7 +51,7 @@ tracks/0/keys = {
"values": [ false ] "values": [ false ]
} }
[sub_resource type="ParticlesMaterial" id=6] [sub_resource type="ParticlesMaterial" id=5]
flag_disable_z = true flag_disable_z = true
gravity = Vector3( 0, 98, 0 ) gravity = Vector3( 0, 98, 0 )
initial_velocity = -30.0 initial_velocity = -30.0
@@ -196,17 +196,17 @@ animations = null
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/pipe"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/pipe"]
position = Vector2( 618, 243.5 ) position = Vector2( 618, 243.5 )
shape = SubResource( 5 ) shape = SubResource( 2 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/pipe"] [node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/pipe"]
anims/start_water = SubResource( 7 ) anims/start_water = SubResource( 3 )
anims/stop_water = SubResource( 8 ) anims/stop_water = SubResource( 4 )
[node name="Particles2D" type="Particles2D" parent="Hotspots/pipe"] [node name="Particles2D" type="Particles2D" parent="Hotspots/pipe"]
position = Vector2( 593, 244 ) position = Vector2( 593, 244 )
emitting = false emitting = false
lifetime = 1.5 lifetime = 1.5
process_material = SubResource( 6 ) process_material = SubResource( 5 )
texture = ExtResource( 9 ) texture = ExtResource( 9 )
[node name="ESCLocation" type="Position2D" parent="Hotspots/pipe"] [node name="ESCLocation" type="Position2D" parent="Hotspots/pipe"]

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

@@ -55,7 +55,7 @@ __meta__ = {
"_editor_description_": "" "_editor_description_": ""
} }
[node name="Hotspots" type="Node" parent="."] [node name="Hotspots" type="Node2D" parent="."]
[node name="l_exit" parent="Hotspots" instance=ExtResource( 3 )] [node name="l_exit" parent="Hotspots" instance=ExtResource( 3 )]
pause_mode = 1 pause_mode = 1

60
game/rooms/room07/room07.tscn
View File

@@ -13,7 +13,7 @@
[ext_resource path="res://game/rooms/room07/elevator_door.png" type="Texture" id=12] [ext_resource path="res://game/rooms/room07/elevator_door.png" type="Texture" id=12]
[ext_resource path="res://game/characters/mark/png/mark.png" type="Texture" id=13] [ext_resource path="res://game/characters/mark/png/mark.png" type="Texture" id=13]
[sub_resource type="Animation" id=12] [sub_resource type="Animation" id=1]
length = 0.001 length = 0.001
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath(".:position") tracks/0/path = NodePath(".:position")
@@ -216,7 +216,7 @@ tracks/18/keys = {
"values": [ false ] "values": [ false ]
} }
[sub_resource type="Animation" id=14] [sub_resource type="Animation" id=2]
resource_name = "lift_floor_1_to_2_no_player" resource_name = "lift_floor_1_to_2_no_player"
length = 5.5 length = 5.5
tracks/0/type = "bezier" tracks/0/type = "bezier"
@@ -302,7 +302,7 @@ tracks/7/keys = {
"values": [ false ] "values": [ false ]
} }
[sub_resource type="Animation" id=18] [sub_resource type="Animation" id=3]
resource_name = "lift_floor_1_to_2_with_player" resource_name = "lift_floor_1_to_2_with_player"
length = 5.5 length = 5.5
tracks/0/type = "bezier" tracks/0/type = "bezier"
@@ -388,7 +388,7 @@ tracks/7/keys = {
"values": [ true, false ] "values": [ true, false ]
} }
[sub_resource type="Animation" id=15] [sub_resource type="Animation" id=4]
resource_name = "lift_floor_2_to_1_no_player" resource_name = "lift_floor_2_to_1_no_player"
length = 5.5 length = 5.5
tracks/0/type = "bezier" tracks/0/type = "bezier"
@@ -474,7 +474,7 @@ tracks/7/keys = {
"values": [ false ] "values": [ false ]
} }
[sub_resource type="Animation" id=19] [sub_resource type="Animation" id=5]
resource_name = "lift_floor_2_to_1_with_player" resource_name = "lift_floor_2_to_1_with_player"
length = 5.5 length = 5.5
tracks/0/type = "bezier" tracks/0/type = "bezier"
@@ -560,17 +560,17 @@ tracks/7/keys = {
"values": [ true, false ] "values": [ true, false ]
} }
[sub_resource type="NavigationPolygon" id=1] [sub_resource type="NavigationPolygon" id=6]
vertices = PoolVector2Array( 2161.27, 3.52002, 2166.27, -45.48, 2237.27, 3.52002, 2237.27, 150.52, 6.26837, -11.48, 73.2684, -50.48, 76.2684, 11.52, 3.26837, 147.52, 127.268, -36.48, 1852.27, -39.48, 1954.27, -36.48, 1855.27, -76.48, 1954.27, -76.48, 2104.27, -36.48 ) vertices = PoolVector2Array( 2161.27, 3.52002, 2166.27, -45.48, 2237.27, 3.52002, 2237.27, 150.52, 6.26837, -11.48, 73.2684, -50.48, 76.2684, 11.52, 3.26837, 147.52, 127.268, -36.48, 1852.27, -39.48, 1954.27, -36.48, 1855.27, -76.48, 1954.27, -76.48, 2104.27, -36.48 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6, 7 ), PoolIntArray( 3, 7, 6, 8, 9, 10 ), PoolIntArray( 11, 12, 10, 9 ), PoolIntArray( 3, 10, 13, 0 ) ] polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6, 7 ), PoolIntArray( 3, 7, 6, 8, 9, 10 ), PoolIntArray( 11, 12, 10, 9 ), PoolIntArray( 3, 10, 13, 0 ) ]
outlines = [ PoolVector2Array( 127.268, -36.48, 1852.27, -39.48, 1855.27, -76.48, 1954.27, -76.48, 1954.27, -36.48, 2104.27, -36.48, 2161.27, 3.52002, 2166.27, -45.48, 2237.27, 3.52002, 2237.27, 150.52, 3.26837, 147.52, 6.26837, -11.48, 73.2684, -50.48, 76.2684, 11.52 ) ] outlines = [ PoolVector2Array( 127.268, -36.48, 1852.27, -39.48, 1855.27, -76.48, 1954.27, -76.48, 1954.27, -36.48, 2104.27, -36.48, 2161.27, 3.52002, 2166.27, -45.48, 2237.27, 3.52002, 2237.27, 150.52, 3.26837, 147.52, 6.26837, -11.48, 73.2684, -50.48, 76.2684, 11.52 ) ]
[sub_resource type="NavigationPolygon" id=2] [sub_resource type="NavigationPolygon" id=7]
vertices = PoolVector2Array( 2237, -827.26, 14, -822.26, 14, -932.26, 144, -1011.26, 1844, -1005.26, 2240, -926.26, 1844, -1020.26, 1968, -1022.26, 1974, -1005.26, 2126, -1008.26 ) vertices = PoolVector2Array( 2237, -827.26, 14, -822.26, 14, -932.26, 144, -1011.26, 1844, -1005.26, 2240, -926.26, 1844, -1020.26, 1968, -1022.26, 1974, -1005.26, 2126, -1008.26 )
polygons = [ PoolIntArray( 0, 1, 2, 3, 4, 5 ), PoolIntArray( 4, 6, 7, 8 ), PoolIntArray( 5, 4, 8 ), PoolIntArray( 5, 8, 9 ) ] polygons = [ PoolIntArray( 0, 1, 2, 3, 4, 5 ), PoolIntArray( 4, 6, 7, 8 ), PoolIntArray( 5, 4, 8 ), PoolIntArray( 5, 8, 9 ) ]
outlines = [ PoolVector2Array( 2237, -827.26, 2240, -926.26, 2126, -1008.26, 1974, -1005.26, 1968, -1022.26, 1844, -1020.26, 1844, -1005.26, 144, -1011.26, 14, -932.26, 14, -822.26 ) ] outlines = [ PoolVector2Array( 2237, -827.26, 2240, -926.26, 2126, -1008.26, 1974, -1005.26, 1968, -1022.26, 1844, -1020.26, 1844, -1005.26, 144, -1011.26, 14, -932.26, 14, -822.26 ) ]
[sub_resource type="Animation" id=9] [sub_resource type="Animation" id=8]
length = 0.001 length = 0.001
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("AlarmCone:modulate") tracks/0/path = NodePath("AlarmCone:modulate")
@@ -585,7 +585,7 @@ tracks/0/keys = {
"values": [ Color( 1, 1, 1, 1 ) ] "values": [ Color( 1, 1, 1, 1 ) ]
} }
[sub_resource type="Animation" id=10] [sub_resource type="Animation" id=9]
resource_name = "camera_not_triggered" resource_name = "camera_not_triggered"
length = 0.1 length = 0.1
tracks/0/type = "value" tracks/0/type = "value"
@@ -601,7 +601,7 @@ tracks/0/keys = {
"values": [ Color( 1, 1, 1, 1 ) ] "values": [ Color( 1, 1, 1, 1 ) ]
} }
[sub_resource type="Animation" id=11] [sub_resource type="Animation" id=10]
resource_name = "camera_triggered" resource_name = "camera_triggered"
length = 0.1 length = 0.1
tracks/0/type = "value" tracks/0/type = "value"
@@ -617,7 +617,7 @@ tracks/0/keys = {
"values": [ Color( 1, 0, 0, 1 ) ] "values": [ Color( 1, 0, 0, 1 ) ]
} }
[sub_resource type="Animation" id=20] [sub_resource type="Animation" id=11]
length = 0.001 length = 0.001
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("AlarmCone:modulate") tracks/0/path = NodePath("AlarmCone:modulate")
@@ -632,7 +632,7 @@ tracks/0/keys = {
"values": [ Color( 1, 1, 1, 1 ) ] "values": [ Color( 1, 1, 1, 1 ) ]
} }
[sub_resource type="Animation" id=21] [sub_resource type="Animation" id=12]
resource_name = "camera_not_triggered" resource_name = "camera_not_triggered"
length = 0.1 length = 0.1
tracks/0/type = "value" tracks/0/type = "value"
@@ -648,7 +648,7 @@ tracks/0/keys = {
"values": [ Color( 1, 1, 1, 1 ) ] "values": [ Color( 1, 1, 1, 1 ) ]
} }
[sub_resource type="Animation" id=22] [sub_resource type="Animation" id=13]
resource_name = "camera_triggered" resource_name = "camera_triggered"
length = 0.1 length = 0.1
tracks/0/type = "value" tracks/0/type = "value"
@@ -715,11 +715,11 @@ texture = ExtResource( 12 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="lift"] [node name="AnimationPlayer" type="AnimationPlayer" parent="lift"]
root_node = NodePath("../lift") root_node = NodePath("../lift")
anims/RESET = SubResource( 12 ) anims/RESET = SubResource( 1 )
anims/lift_floor_1_to_2_no_player = SubResource( 14 ) anims/lift_floor_1_to_2_no_player = SubResource( 2 )
anims/lift_floor_1_to_2_with_player = SubResource( 18 ) anims/lift_floor_1_to_2_with_player = SubResource( 3 )
anims/lift_floor_2_to_1_no_player = SubResource( 15 ) anims/lift_floor_2_to_1_no_player = SubResource( 4 )
anims/lift_floor_2_to_1_with_player = SubResource( 19 ) anims/lift_floor_2_to_1_with_player = SubResource( 5 )
[node name="door_1_floor_2" type="Sprite" parent="lift"] [node name="door_1_floor_2" type="Sprite" parent="lift"]
position = Vector2( 1510, 251 ) position = Vector2( 1510, 251 )
@@ -754,8 +754,8 @@ margin_left = 7.0
margin_top = 3.0 margin_top = 3.0
margin_right = 89.0 margin_right = 89.0
margin_bottom = 24.0 margin_bottom = 24.0
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 5 ) custom_fonts/font = ExtResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "ROOM 7 upper floor" text = "ROOM 7 upper floor"
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
@@ -766,8 +766,8 @@ margin_left = 10.0
margin_top = 628.0 margin_top = 628.0
margin_right = 182.0 margin_right = 182.0
margin_bottom = 649.0 margin_bottom = 649.0
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 5 ) custom_fonts/font = ExtResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "ROOM 7 lower floor" text = "ROOM 7 lower floor"
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
@@ -778,8 +778,8 @@ margin_left = 275.0
margin_top = 681.0 margin_top = 681.0
margin_right = 989.0 margin_right = 989.0
margin_bottom = 885.0 margin_bottom = 885.0
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_fonts/font = ExtResource( 5 ) custom_fonts/font = ExtResource( 5 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
text = "camera_push : This will point the camera at a specific location. text = "camera_push : This will point the camera at a specific location.
camera_shift : Moves the camera by an amount of pixels in x and y relative to the current location camera_shift : Moves the camera by an amount of pixels in x and y relative to the current location
camera_zoom : Adjust the zoom level relative to the initial camera zoom camera_zoom : Adjust the zoom level relative to the initial camera zoom
@@ -797,17 +797,17 @@ script = ExtResource( 1 )
[node name="lower_platform" type="NavigationPolygonInstance" parent="walkable_area"] [node name="lower_platform" type="NavigationPolygonInstance" parent="walkable_area"]
position = Vector2( 7.73163, 1138.48 ) position = Vector2( 7.73163, 1138.48 )
navpoly = SubResource( 1 ) navpoly = SubResource( 6 )
__meta__ = { __meta__ = {
"_editor_description_": "" "_editor_description_": ""
} }
[node name="upper_platform" type="NavigationPolygonInstance" parent="walkable_area"] [node name="upper_platform" type="NavigationPolygonInstance" parent="walkable_area"]
position = Vector2( 0, 1403.26 ) position = Vector2( 0, 1403.26 )
navpoly = SubResource( 2 ) navpoly = SubResource( 7 )
enabled = false enabled = false
[node name="Hotspots" type="Node" parent="."] [node name="Hotspots" type="Node2D" parent="."]
[node name="l_exit" type="Area2D" parent="Hotspots"] [node name="l_exit" type="Area2D" parent="Hotspots"]
pause_mode = 1 pause_mode = 1
@@ -1034,9 +1034,9 @@ position = Vector2( 1093, 1055 )
texture = ExtResource( 10 ) texture = ExtResource( 10 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/alarm_cone_floor1"] [node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/alarm_cone_floor1"]
anims/RESET = SubResource( 9 ) anims/RESET = SubResource( 8 )
anims/camera_not_triggered = SubResource( 10 ) anims/camera_not_triggered = SubResource( 9 )
anims/camera_triggered = SubResource( 11 ) anims/camera_triggered = SubResource( 10 )
[node name="Label" type="Label" parent="Hotspots/alarm_cone_floor1"] [node name="Label" type="Label" parent="Hotspots/alarm_cone_floor1"]
margin_left = 999.0 margin_left = 999.0
@@ -1071,9 +1071,9 @@ position = Vector2( 1093, 346 )
texture = ExtResource( 10 ) texture = ExtResource( 10 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/alarm_cone_floor2"] [node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/alarm_cone_floor2"]
anims/RESET = SubResource( 20 ) anims/RESET = SubResource( 11 )
anims/camera_not_triggered = SubResource( 21 ) anims/camera_not_triggered = SubResource( 12 )
anims/camera_triggered = SubResource( 22 ) anims/camera_triggered = SubResource( 13 )
[node name="Label" type="Label" parent="Hotspots/alarm_cone_floor2"] [node name="Label" type="Label" parent="Hotspots/alarm_cone_floor2"]
margin_left = 982.0 margin_left = 982.0

20
game/rooms/room08/room08.tscn
View File

@@ -17,7 +17,7 @@ vertices = PoolVector2Array( 4.26837, 653.779, 86.2684, 608.779, 87.2684, 635.77
polygons = [ PoolIntArray( 0, 1, 2 ), PoolIntArray( 3, 4, 0, 2 ), PoolIntArray( 3, 2, 5, 6, 7 ), PoolIntArray( 6, 8, 9, 10 ), PoolIntArray( 7, 6, 10 ), PoolIntArray( 7, 10, 11 ) ] polygons = [ PoolIntArray( 0, 1, 2 ), PoolIntArray( 3, 4, 0, 2 ), PoolIntArray( 3, 2, 5, 6, 7 ), PoolIntArray( 6, 8, 9, 10 ), PoolIntArray( 7, 6, 10 ), PoolIntArray( 7, 10, 11 ) ]
outlines = [ PoolVector2Array( 4.26837, 653.779, 86.2684, 608.779, 87.2684, 635.779, 112.268, 621.779, 642.268, 624.779, 642.268, 586.779, 790.268, 585.779, 791.268, 624.779, 1154.27, 622.779, 1259.27, 687.779, 1260.27, 808.779, 3.26837, 810.779 ) ] outlines = [ PoolVector2Array( 4.26837, 653.779, 86.2684, 608.779, 87.2684, 635.779, 112.268, 621.779, 642.268, 624.779, 642.268, 586.779, 790.268, 585.779, 791.268, 624.779, 1154.27, 622.779, 1259.27, 687.779, 1260.27, 808.779, 3.26837, 810.779 ) ]
[sub_resource type="Animation" id=5] [sub_resource type="Animation" id=2]
length = 0.001 length = 0.001
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("door1:position") tracks/0/path = NodePath("door1:position")
@@ -92,8 +92,7 @@ tracks/5/keys = {
"values": [ ExtResource( 10 ) ] "values": [ ExtResource( 10 ) ]
} }
[sub_resource type="Animation" id=2] [sub_resource type="Animation" id=3]
resource_name = "door_close"
length = 1.5 length = 1.5
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("door1:position") tracks/0/path = NodePath("door1:position")
@@ -144,8 +143,7 @@ tracks/3/keys = {
"values": [ Vector2( 899, 203 ), Vector2( 723, 203 ) ] "values": [ Vector2( 899, 203 ), Vector2( 723, 203 ) ]
} }
[sub_resource type="Animation" id=3] [sub_resource type="Animation" id=4]
resource_name = "door_open"
length = 1.5 length = 1.5
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("door1:position") tracks/0/path = NodePath("door1:position")
@@ -196,7 +194,7 @@ tracks/3/keys = {
"values": [ Vector2( 723, 203 ), Vector2( 899, 203 ) ] "values": [ Vector2( 723, 203 ), Vector2( 899, 203 ) ]
} }
[sub_resource type="RectangleShape2D" id=4] [sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 31, 30.5 ) extents = Vector2( 31, 30.5 )
[sub_resource type="RectangleShape2D" id=6] [sub_resource type="RectangleShape2D" id=6]
@@ -262,7 +260,7 @@ Unlocking the puzzle disables (and
hides) the locked button, showing the hides) the locked button, showing the
unlocked graphic underneath." unlocked graphic underneath."
[node name="Hotspots" type="Node" parent="."] [node name="Hotspots" type="Node2D" parent="."]
[node name="l_door" type="Area2D" parent="Hotspots"] [node name="l_door" type="Area2D" parent="Hotspots"]
pause_mode = 1 pause_mode = 1
@@ -307,9 +305,9 @@ position = Vector2( 724, 354 )
script = ExtResource( 7 ) script = ExtResource( 7 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/m_door"] [node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/m_door"]
anims/RESET = SubResource( 5 ) anims/RESET = SubResource( 2 )
anims/door_close = SubResource( 2 ) anims/door_close = SubResource( 3 )
anims/door_open = SubResource( 3 ) anims/door_open = SubResource( 4 )
[node name="door1" type="Sprite" parent="Hotspots/m_door"] [node name="door1" type="Sprite" parent="Hotspots/m_door"]
position = Vector2( 723, 203 ) position = Vector2( 723, 203 )
@@ -368,7 +366,7 @@ texture = ExtResource( 9 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/r8_mini_puzzle_button"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/r8_mini_puzzle_button"]
position = Vector2( 526, 191.5 ) position = Vector2( 526, 191.5 )
shape = SubResource( 4 ) shape = SubResource( 5 )
[node name="Position2D" type="Position2D" parent="Hotspots/r8_mini_puzzle_button"] [node name="Position2D" type="Position2D" parent="Hotspots/r8_mini_puzzle_button"]
position = Vector2( 532, 370 ) position = Vector2( 532, 370 )

327
game/rooms/room09/room09.tscn
View File

@@ -22,7 +22,7 @@ vertices = PoolVector2Array( 1168.92, 640.557, 1182.53, 588.863, 1269.59, 622.87
polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 3, 5, 6, 7 ), PoolIntArray( 8, 9, 7, 10 ), PoolIntArray( 6, 11, 12, 10 ), PoolIntArray( 4, 13, 14, 0, 3 ), PoolIntArray( 7, 6, 10 ) ] polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 3, 5, 6, 7 ), PoolIntArray( 8, 9, 7, 10 ), PoolIntArray( 6, 11, 12, 10 ), PoolIntArray( 4, 13, 14, 0, 3 ), PoolIntArray( 7, 6, 10 ) ]
outlines = [ PoolVector2Array( -6.44019, 711.297, 3.15687, 646.051, 59.2201, 628.698, 84.5821, 654.06, 129.634, 615.792, 455.268, 618.779, 491.268, 705.779, 820.268, 705.779, 864.626, 613.518, 1143.08, 613.35, 1168.92, 640.557, 1182.53, 588.863, 1269.59, 622.872, 1275.03, 799.721, -9.16094, 803.802 ) ] outlines = [ PoolVector2Array( -6.44019, 711.297, 3.15687, 646.051, 59.2201, 628.698, 84.5821, 654.06, 129.634, 615.792, 455.268, 618.779, 491.268, 705.779, 820.268, 705.779, 864.626, 613.518, 1143.08, 613.35, 1168.92, 640.557, 1182.53, 588.863, 1269.59, 622.872, 1275.03, 799.721, -9.16094, 803.802 ) ]
[sub_resource type="Animation" id=11] [sub_resource type="Animation" id=2]
length = 0.001 length = 0.001
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("bottle:visible") tracks/0/path = NodePath("bottle:visible")
@@ -37,7 +37,7 @@ tracks/0/keys = {
"values": [ false ] "values": [ false ]
} }
[sub_resource type="Animation" id=12] [sub_resource type="Animation" id=3]
resource_name = "remove_bottle" resource_name = "remove_bottle"
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("bottle:visible") tracks/0/path = NodePath("bottle:visible")
@@ -52,8 +52,7 @@ tracks/0/keys = {
"values": [ false ] "values": [ false ]
} }
[sub_resource type="Animation" id=2] [sub_resource type="Animation" id=4]
resource_name = "set_bottle"
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("bottle:visible") tracks/0/path = NodePath("bottle:visible")
tracks/0/interp = 1 tracks/0/interp = 1
@@ -67,7 +66,7 @@ tracks/0/keys = {
"values": [ true ] "values": [ true ]
} }
[sub_resource type="Animation" id=13] [sub_resource type="Animation" id=5]
length = 0.001 length = 0.001
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("Sprite:position") tracks/0/path = NodePath("Sprite:position")
@@ -134,7 +133,7 @@ tracks/5/keys = {
"values": [ true ] "values": [ true ]
} }
[sub_resource type="Animation" id=14] [sub_resource type="Animation" id=6]
resource_name = "close_door" resource_name = "close_door"
length = 0.1 length = 0.1
tracks/0/type = "value" tracks/0/type = "value"
@@ -174,7 +173,7 @@ tracks/2/keys = {
"values": [ true ] "values": [ true ]
} }
[sub_resource type="Animation" id=15] [sub_resource type="Animation" id=7]
resource_name = "open_door" resource_name = "open_door"
length = 1.1 length = 1.1
tracks/0/type = "bezier" tracks/0/type = "bezier"
@@ -230,154 +229,148 @@ tracks/4/keys = {
"values": [ true, false ] "values": [ true, false ]
} }
[sub_resource type="RectangleShape2D" id=3] [sub_resource type="RectangleShape2D" id=8]
extents = Vector2( 40, 40 ) extents = Vector2( 40, 40 )
[sub_resource type="RectangleShape2D" id=4] [sub_resource type="RectangleShape2D" id=9]
extents = Vector2( 49, 147.5 ) extents = Vector2( 49, 147.5 )
[sub_resource type="Animation" id=5]
resource_name = "close_door"
length = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("closed_door:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ true ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("opened_door:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=6]
resource_name = "open_door"
length = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("opened_door:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ true ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("closed_door:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=7]
resource_name = "close_door"
length = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("closed_door:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ true ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("opened_door:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=8]
resource_name = "open_door"
length = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("opened_door:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ true ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("closed_door:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=9]
resource_name = "close_door"
length = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("closed_door:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ true ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("opened_door:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=10] [sub_resource type="Animation" id=10]
resource_name = "open_door" length = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("closed_door:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ true ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("opened_door:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=11]
length = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("opened_door:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ true ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("closed_door:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=12]
length = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("closed_door:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ true ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("opened_door:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=13]
length = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("opened_door:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ true ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("closed_door:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=14]
length = 0.1
tracks/0/type = "value"
tracks/0/path = NodePath("closed_door:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ true ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("opened_door:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=15]
length = 0.1 length = 0.1
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("opened_door:visible") tracks/0/path = NodePath("opened_door:visible")
@@ -463,7 +456,7 @@ z_index = -2
color = Color( 0, 0, 0, 1 ) color = Color( 0, 0, 0, 1 )
polygon = PoolVector2Array( 1172, 54, 1280, 96, 1278, 422, 1173, 355 ) polygon = PoolVector2Array( 1172, 54, 1280, 96, 1278, 422, 1173, 355 )
[node name="Hotspots" type="Node" parent="."] [node name="Hotspots" type="Node2D" parent="."]
[node name="stand" type="Area2D" parent="Hotspots"] [node name="stand" type="Area2D" parent="Hotspots"]
pause_mode = 1 pause_mode = 1
@@ -488,9 +481,9 @@ position = Vector2( 1108.62, 235.109 )
texture = ExtResource( 15 ) texture = ExtResource( 15 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/stand"] [node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/stand"]
anims/RESET = SubResource( 11 ) anims/RESET = SubResource( 2 )
anims/remove_bottle = SubResource( 12 ) anims/remove_bottle = SubResource( 3 )
anims/set_bottle = SubResource( 2 ) anims/set_bottle = SubResource( 4 )
[node name="Position2D" type="Position2D" parent="Hotspots/stand"] [node name="Position2D" type="Position2D" parent="Hotspots/stand"]
position = Vector2( 1043.27, 359.243 ) position = Vector2( 1043.27, 359.243 )
@@ -528,9 +521,9 @@ z_index = -1
texture = ExtResource( 16 ) texture = ExtResource( 16 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/door_r"] [node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/door_r"]
anims/RESET = SubResource( 13 ) anims/RESET = SubResource( 5 )
anims/close_door = SubResource( 14 ) anims/close_door = SubResource( 6 )
anims/open_door = SubResource( 15 ) anims/open_door = SubResource( 7 )
[node name="reset_button" type="Area2D" parent="Hotspots"] [node name="reset_button" type="Area2D" parent="Hotspots"]
pause_mode = 1 pause_mode = 1
@@ -546,7 +539,7 @@ animations = null
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/reset_button"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/reset_button"]
position = Vector2( 291, 194 ) position = Vector2( 291, 194 )
shape = SubResource( 3 ) shape = SubResource( 8 )
[node name="Label" type="Label" parent="Hotspots/reset_button"] [node name="Label" type="Label" parent="Hotspots/reset_button"]
margin_left = 242.0 margin_left = 242.0
@@ -591,7 +584,7 @@ script = ExtResource( 12 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/r9_closet_left"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/r9_closet_left"]
position = Vector2( 570, 248.5 ) position = Vector2( 570, 248.5 )
shape = SubResource( 4 ) shape = SubResource( 9 )
[node name="bottle_left" parent="Hotspots/r9_closet_left" instance=ExtResource( 11 )] [node name="bottle_left" parent="Hotspots/r9_closet_left" instance=ExtResource( 11 )]
position = Vector2( 598, 162 ) position = Vector2( 598, 162 )
@@ -603,8 +596,8 @@ position = Vector2( -27, 285 )
script = ExtResource( 12 ) script = ExtResource( 12 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/r9_closet_left"] [node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/r9_closet_left"]
anims/close_door = SubResource( 5 ) anims/close_door = SubResource( 10 )
anims/open_door = SubResource( 6 ) anims/open_door = SubResource( 11 )
[node name="r9_closet_middle" type="Area2D" parent="Hotspots"] [node name="r9_closet_middle" type="Area2D" parent="Hotspots"]
pause_mode = 1 pause_mode = 1
@@ -632,7 +625,7 @@ script = ExtResource( 12 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/r9_closet_middle"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/r9_closet_middle"]
position = Vector2( 670, 248 ) position = Vector2( 670, 248 )
shape = SubResource( 4 ) shape = SubResource( 9 )
[node name="bottle_middle" parent="Hotspots/r9_closet_middle" instance=ExtResource( 11 )] [node name="bottle_middle" parent="Hotspots/r9_closet_middle" instance=ExtResource( 11 )]
position = Vector2( 692, 163 ) position = Vector2( 692, 163 )
@@ -644,8 +637,8 @@ position = Vector2( -21, 284 )
script = ExtResource( 12 ) script = ExtResource( 12 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/r9_closet_middle"] [node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/r9_closet_middle"]
anims/close_door = SubResource( 7 ) anims/close_door = SubResource( 12 )
anims/open_door = SubResource( 8 ) anims/open_door = SubResource( 13 )
[node name="r9_closet_right" type="Area2D" parent="Hotspots"] [node name="r9_closet_right" type="Area2D" parent="Hotspots"]
pause_mode = 1 pause_mode = 1
@@ -674,7 +667,7 @@ script = ExtResource( 12 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/r9_closet_right"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/r9_closet_right"]
position = Vector2( 670, 248 ) position = Vector2( 670, 248 )
shape = SubResource( 4 ) shape = SubResource( 9 )
[node name="bottle_right" parent="Hotspots/r9_closet_right" instance=ExtResource( 11 )] [node name="bottle_right" parent="Hotspots/r9_closet_right" instance=ExtResource( 11 )]
position = Vector2( 682, 163 ) position = Vector2( 682, 163 )
@@ -686,8 +679,8 @@ position = Vector2( -11, 284 )
script = ExtResource( 12 ) script = ExtResource( 12 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/r9_closet_right"] [node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/r9_closet_right"]
anims/close_door = SubResource( 9 ) anims/close_door = SubResource( 14 )
anims/open_door = SubResource( 10 ) anims/open_door = SubResource( 15 )
[node name="player_start" type="Position2D" parent="."] [node name="player_start" type="Position2D" parent="."]
position = Vector2( 76.7617, 437.649 ) position = Vector2( 76.7617, 437.649 )