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

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 ) ]
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
tracks/0/type = "value"
tracks/0/path = NodePath("bottle:visible")
@@ -37,7 +37,7 @@ tracks/0/keys = {
"values": [ false ]
}
[sub_resource type="Animation" id=12]
[sub_resource type="Animation" id=3]
resource_name = "remove_bottle"
tracks/0/type = "value"
tracks/0/path = NodePath("bottle:visible")
@@ -52,8 +52,7 @@ tracks/0/keys = {
"values": [ false ]
}
[sub_resource type="Animation" id=2]
resource_name = "set_bottle"
[sub_resource type="Animation" id=4]
tracks/0/type = "value"
tracks/0/path = NodePath("bottle:visible")
tracks/0/interp = 1
@@ -67,7 +66,7 @@ tracks/0/keys = {
"values": [ true ]
}
[sub_resource type="Animation" id=13]
[sub_resource type="Animation" id=5]
length = 0.001
tracks/0/type = "value"
tracks/0/path = NodePath("Sprite:position")
@@ -134,7 +133,7 @@ tracks/5/keys = {
"values": [ true ]
}
[sub_resource type="Animation" id=14]
[sub_resource type="Animation" id=6]
resource_name = "close_door"
length = 0.1
tracks/0/type = "value"
@@ -174,7 +173,7 @@ tracks/2/keys = {
"values": [ true ]
}
[sub_resource type="Animation" id=15]
[sub_resource type="Animation" id=7]
resource_name = "open_door"
length = 1.1
tracks/0/type = "bezier"
@@ -230,154 +229,148 @@ tracks/4/keys = {
"values": [ true, false ]
}
[sub_resource type="RectangleShape2D" id=3]
[sub_resource type="RectangleShape2D" id=8]
extents = Vector2( 40, 40 )
[sub_resource type="RectangleShape2D" id=4]
[sub_resource type="RectangleShape2D" id=9]
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]
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
tracks/0/type = "value"
tracks/0/path = NodePath("opened_door:visible")
@@ -463,7 +456,7 @@ z_index = -2
color = Color( 0, 0, 0, 1 )
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"]
pause_mode = 1
@@ -488,9 +481,9 @@ position = Vector2( 1108.62, 235.109 )
texture = ExtResource( 15 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/stand"]
anims/RESET = SubResource( 11 )
anims/remove_bottle = SubResource( 12 )
anims/set_bottle = SubResource( 2 )
anims/RESET = SubResource( 2 )
anims/remove_bottle = SubResource( 3 )
anims/set_bottle = SubResource( 4 )
[node name="Position2D" type="Position2D" parent="Hotspots/stand"]
position = Vector2( 1043.27, 359.243 )
@@ -528,9 +521,9 @@ z_index = -1
texture = ExtResource( 16 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/door_r"]
anims/RESET = SubResource( 13 )
anims/close_door = SubResource( 14 )
anims/open_door = SubResource( 15 )
anims/RESET = SubResource( 5 )
anims/close_door = SubResource( 6 )
anims/open_door = SubResource( 7 )
[node name="reset_button" type="Area2D" parent="Hotspots"]
pause_mode = 1
@@ -546,7 +539,7 @@ animations = null
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/reset_button"]
position = Vector2( 291, 194 )
shape = SubResource( 3 )
shape = SubResource( 8 )
[node name="Label" type="Label" parent="Hotspots/reset_button"]
margin_left = 242.0
@@ -591,7 +584,7 @@ script = ExtResource( 12 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/r9_closet_left"]
position = Vector2( 570, 248.5 )
shape = SubResource( 4 )
shape = SubResource( 9 )
[node name="bottle_left" parent="Hotspots/r9_closet_left" instance=ExtResource( 11 )]
position = Vector2( 598, 162 )
@@ -603,8 +596,8 @@ position = Vector2( -27, 285 )
script = ExtResource( 12 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/r9_closet_left"]
anims/close_door = SubResource( 5 )
anims/open_door = SubResource( 6 )
anims/close_door = SubResource( 10 )
anims/open_door = SubResource( 11 )
[node name="r9_closet_middle" type="Area2D" parent="Hotspots"]
pause_mode = 1
@@ -632,7 +625,7 @@ script = ExtResource( 12 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/r9_closet_middle"]
position = Vector2( 670, 248 )
shape = SubResource( 4 )
shape = SubResource( 9 )
[node name="bottle_middle" parent="Hotspots/r9_closet_middle" instance=ExtResource( 11 )]
position = Vector2( 692, 163 )
@@ -644,8 +637,8 @@ position = Vector2( -21, 284 )
script = ExtResource( 12 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/r9_closet_middle"]
anims/close_door = SubResource( 7 )
anims/open_door = SubResource( 8 )
anims/close_door = SubResource( 12 )
anims/open_door = SubResource( 13 )
[node name="r9_closet_right" type="Area2D" parent="Hotspots"]
pause_mode = 1
@@ -674,7 +667,7 @@ script = ExtResource( 12 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hotspots/r9_closet_right"]
position = Vector2( 670, 248 )
shape = SubResource( 4 )
shape = SubResource( 9 )
[node name="bottle_right" parent="Hotspots/r9_closet_right" instance=ExtResource( 11 )]
position = Vector2( 682, 163 )
@@ -686,8 +679,8 @@ position = Vector2( -11, 284 )
script = ExtResource( 12 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="Hotspots/r9_closet_right"]
anims/close_door = SubResource( 9 )
anims/open_door = SubResource( 10 )
anims/close_door = SubResource( 14 )
anims/open_door = SubResource( 15 )
[node name="player_start" type="Position2D" parent="."]
position = Vector2( 76.7617, 437.649 )