diff --git a/game/rooms/room10/background.tscn b/game/rooms/room10/background.tscn deleted file mode 100644 index fa42fc10..00000000 --- a/game/rooms/room10/background.tscn +++ /dev/null @@ -1,30 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=1] - -[node name="background" type="TextureRect"] -margin_right = 1289.0 -margin_bottom = 555.0 -mouse_filter = 2 -script = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="l_platform" type="Line2D" parent="."] -position = Vector2( 2, -266 ) -points = PoolVector2Array( -2.96298, 712.01, 129.973, 614.429, 1167.5, 612.894, 1274.59, 669.705, 1273.25, 812.694, 2.36697, 811.043, 2.36697, 713.389 ) - -[node name="l_door" type="Line2D" parent="."] -position = Vector2( 0, -266 ) -points = PoolVector2Array( 6.61201, 704.409, 6.61203, 389.558, 87.755, 339.775, 87.5463, 649.784 ) -__meta__ = { -"_editor_description_": "" -} - -[node name="r_door" type="Line2D" parent="."] -position = Vector2( 0, -267.828 ) -points = PoolVector2Array( 1175.07, 620.086, 1171.24, 311.267, 1274.8, 356.87, 1278.31, 672.412, 1188.64, 624.843 ) -__meta__ = { -"_editor_description_": "" -} diff --git a/game/rooms/room10/esc/button_slide.esc b/game/rooms/room10/esc/button_slide.esc index 3c84cb87..afedb3ca 100644 --- a/game/rooms/room10/esc/button_slide.esc +++ b/game/rooms/room10/esc/button_slide.esc @@ -1,6 +1,7 @@ # Testing the slide and slide_block command :use +accept_input SKIP say player "UUUuugh. I'm not feeling so well..." slide_block player slide_pos_1 @@ -16,3 +17,4 @@ say player "Heeeeeeeelp!" :slide_back slide_block player slide_location say player "That's better." +accept_input ALL \ No newline at end of file diff --git a/game/rooms/room10/esc/button_turn_to.esc b/game/rooms/room10/esc/button_turn_to.esc index 33a57ce9..80d335d2 100644 --- a/game/rooms/room10/esc/button_turn_to.esc +++ b/game/rooms/room10/esc/button_turn_to.esc @@ -2,8 +2,8 @@ say player "Huh?" -turn_to player slide_pos_1 +turn_to player r10_l_exit say player "Nothing." -turn_to player slide_pos_2 0.2 +turn_to player r10_r_exit 0.2 diff --git a/game/rooms/room10/r_door.tscn b/game/rooms/room10/r_door.tscn deleted file mode 100644 index 39b4fa38..00000000 --- a/game/rooms/room10/r_door.tscn +++ /dev/null @@ -1,25 +0,0 @@ -[gd_scene load_steps=3 format=2] - -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=1] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=2] - -[node name="r_door" type="Area2D"] -pause_mode = 1 -script = ExtResource( 1 ) -__meta__ = { -"_editor_description_": "" -} -global_id = "r1_r_exit" -esc_script = "res://game/rooms/room01/esc/right_exit.esc" -is_exit = true -tooltip_name = "Exit" -default_action = "walk" -dialog_color = Color( 1, 1, 1, 1 ) -animations = null - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -polygon = PoolVector2Array( 1177.94, 348.61, 1175.95, 45.3759, 1276.06, 92.0953, 1277.95, 399.407 ) - -[node name="Position2D" type="Position2D" parent="."] -position = Vector2( 1225.47, 353.99 ) -script = ExtResource( 2 ) diff --git a/game/rooms/room10/room10.tscn b/game/rooms/room10/room10.tscn index ae618b77..487e17ea 100644 --- a/game/rooms/room10/room10.tscn +++ b/game/rooms/room10/room10.tscn @@ -1,19 +1,19 @@ [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/room10/background.tscn" type="PackedScene" id=2] +[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_exit.gd" type="Script" id=2] [ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3] [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5] [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/room09/button/button.tscn" type="PackedScene" id=8] -[ext_resource path="res://game/rooms/room10/r_door.tscn" type="PackedScene" id=9] +[ext_resource path="res://game/rooms/room10/room10background.png" type="Texture" id=10] +[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=11] [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 ) -polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 0, 3, 6, 7 ), PoolIntArray( 8, 7, 6, 9 ), PoolIntArray( 9, 6, 10, 11, 12 ) ] -outlines = [ PoolVector2Array( -6.44019, 711.297, 3.15687, 646.051, 59.2201, 628.698, 84.5821, 654.06, 129.634, 615.792, 386.666, 618.012, 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 ) ] +vertices = PoolVector2Array( 1185.27, 712.779, 1187.27, 663.779, 1259.27, 705.779, 1260.27, 800.779, 13.2684, 699.779, 83.2684, 666.779, 85.2684, 704.779, 11.2684, 799.779, 112.268, 685.779, 1153.27, 688.779 ) +polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6, 7 ), PoolIntArray( 8, 9, 0, 3, 7, 6 ) ] +outlines = [ PoolVector2Array( 13.2684, 699.779, 83.2684, 666.779, 85.2684, 704.779, 112.268, 685.779, 1153.27, 688.779, 1185.27, 712.779, 1187.27, 663.779, 1259.27, 705.779, 1260.27, 800.779, 11.2684, 799.779 ) ] [node name="room10" type="Node2D"] script = ExtResource( 6 ) @@ -25,17 +25,6 @@ esc_script = "res://game/rooms/room10/esc/room10.esc" player_scene = ExtResource( 4 ) camera_limits = [ Rect2( 0, 0, 1289, 555 ) ] -[node name="background" parent="." instance=ExtResource( 2 )] - -[node name="room_label" type="Label" parent="background"] -margin_right = 70.0 -margin_bottom = 16.0 -custom_fonts/font = ExtResource( 3 ) -text = "ROOM 10" -__meta__ = { -"_edit_use_anchors_": false -} - [node name="walkable_area" type="Navigation2D" parent="."] script = ExtResource( 1 ) @@ -48,6 +37,21 @@ __meta__ = { [node name="Hotspots" type="Node" parent="."] +[node name="r_door" type="Area2D" parent="Hotspots"] +script = ExtResource( 2 ) +global_id = "r10_r_exit" +esc_script = "res://game/rooms/room10/esc/right_exit.esc" +is_exit = true +tooltip_name = "Exit" +default_action = "walk" + +[node name="ESCLocation" type="Position2D" parent="Hotspots/r_door"] +position = Vector2( 1228, 437 ) +script = ExtResource( 5 ) + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_door"] +polygon = PoolVector2Array( 1174, 122, 1280, 167, 1279, 482, 1173, 414 ) + [node name="l_door" type="Area2D" parent="Hotspots"] pause_mode = 1 script = ExtResource( 7 ) @@ -60,161 +64,199 @@ dialog_color = Color( 1, 1, 1, 1 ) animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/l_door"] -polygon = PoolVector2Array( 0.328762, 440.897, 1.85199, 119.926, 85.9517, 74.6212, 87.1409, 377.869 ) +polygon = PoolVector2Array( 1, 482, 3, 166, 109, 124, 109, 413 ) [node name="Position2D" type="Position2D" parent="Hotspots/l_door"] -position = Vector2( 37.4521, 392.045 ) +position = Vector2( 57, 437 ) script = ExtResource( 5 ) -[node name="r_door" parent="Hotspots" instance=ExtResource( 9 )] -global_id = "r10_r_exit" -esc_script = "res://game/rooms/room10/esc/right_exit.esc" - -[node name="Position2D" type="Position2D" parent="Hotspots/r_door"] -position = Vector2( 1198.65, 391.058 ) -script = ExtResource( 5 ) - -[node name="button_stop_bg_music" parent="Hotspots" instance=ExtResource( 8 )] +[node name="button_stop_bg_music" type="Area2D" parent="Hotspots"] pause_mode = 1 -position = Vector2( 243.165, 154.97 ) +script = ExtResource( 7 ) global_id = "r10_btn_stop_bg_music" esc_script = "res://game/rooms/room10/esc/button_stop_bg_music.esc" +tooltip_name = "stop music" +default_action = "use" +dialog_color = Color( 1, 1, 1, 1 ) animations = null -[node name="Position2D" type="Position2D" parent="Hotspots/button_stop_bg_music"] -position = Vector2( 22.6786, 212.927 ) +[node name="ESCLocation" type="Position2D" parent="Hotspots/button_stop_bg_music"] +position = Vector2( 541, 446 ) script = ExtResource( 5 ) [node name="Label" type="Label" parent="Hotspots/button_stop_bg_music"] -margin_left = -20.8195 -margin_top = -29.2381 -margin_right = 87.1805 -margin_bottom = -8.2381 -custom_fonts/font = ExtResource( 3 ) -text = "Stop bg music" -__meta__ = { -"_edit_use_anchors_": false -} +margin_left = 496.7 +margin_top = 272.1 +margin_right = 569.7 +margin_bottom = 320.1 +rect_rotation = 3.02975 +rect_scale = Vector2( 1.35938, 1.49065 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +text = "Stop +background +music" +align = 1 -[node name="button_play_bg_music" parent="Hotspots" instance=ExtResource( 8 )] +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/button_stop_bg_music"] +position = Vector2( 137.7, 41.1 ) +polygon = PoolVector2Array( 358, 212, 460, 220, 455, 319, 351, 315 ) + +[node name="button_play_bg_music" type="Area2D" parent="Hotspots"] pause_mode = 1 -position = Vector2( 377.976, 154.97 ) +script = ExtResource( 7 ) global_id = "r10_btn_play_bg_music" esc_script = "res://game/rooms/room10/esc/button_play_bg_music.esc" +tooltip_name = "play music" +default_action = "use" +dialog_color = Color( 1, 1, 1, 1 ) animations = null -[node name="Position2D" type="Position2D" parent="Hotspots/button_play_bg_music"] -position = Vector2( 22.6786, 212.927 ) +[node name="ESCLocation" type="Position2D" parent="Hotspots/button_play_bg_music"] +position = Vector2( 667, 451 ) script = ExtResource( 5 ) [node name="Label" type="Label" parent="Hotspots/button_play_bg_music"] -margin_left = -18.8195 -margin_top = -29.2381 -margin_right = 85.1805 -margin_bottom = -8.2381 -custom_fonts/font = ExtResource( 3 ) -text = "Play bg music" -__meta__ = { -"_edit_use_anchors_": false -} +margin_left = 595.0 +margin_top = 218.368 +margin_right = 668.0 +margin_bottom = 283.368 +rect_rotation = -26.6278 +rect_scale = Vector2( 1.35608, 1.30798 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +text = "Play +back- +ground +music" +align = 1 -[node name="button_play_sound" parent="Hotspots" instance=ExtResource( 8 )] +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/button_play_bg_music"] +position = Vector2( 244, -35 ) +polygon = PoolVector2Array( 356, 243, 419, 210, 463, 293, 402, 327 ) + +[node name="button_accept_input" type="Area2D" parent="Hotspots"] pause_mode = 1 -position = Vector2( 646.339, 154.97 ) -global_id = "r10_btn_play_snd" -esc_script = "res://game/rooms/room10/esc/button_play_snd.esc" -animations = null - -[node name="Position2D" type="Position2D" parent="Hotspots/button_play_sound"] -position = Vector2( 22.6786, 212.927 ) -script = ExtResource( 5 ) - -[node name="Label" type="Label" parent="Hotspots/button_play_sound"] -margin_left = -10.8195 -margin_top = -29.2381 -margin_right = 72.1805 -margin_bottom = -8.2381 -custom_fonts/font = ExtResource( 3 ) -text = "Play sound" -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="button_accept_input" parent="Hotspots" instance=ExtResource( 8 )] -pause_mode = 1 -position = Vector2( 823.113, 155.354 ) +script = ExtResource( 7 ) global_id = "test_accept_input" esc_script = "res://game/rooms/room10/esc/button_accept_input_test.esc" -tooltip_name = "Test Accept Input" +tooltip_name = "accept input" +default_action = "use" +dialog_color = Color( 1, 1, 1, 1 ) animations = null -[node name="Label" type="Label" parent="Hotspots/button_accept_input"] -margin_left = -3.6864 -margin_top = -44.4435 -margin_right = 85.3136 -margin_bottom = 0.556503 -custom_fonts/font = ExtResource( 3 ) -text = "Test Accept - Input" -__meta__ = { -"_edit_use_anchors_": false -} - [node name="ESCLocation" type="Position2D" parent="Hotspots/button_accept_input"] -position = Vector2( -1.05322, 214.863 ) +position = Vector2( 770, 448 ) script = ExtResource( 5 ) -global_id = "accept_input_location" -[node name="button_slide" parent="Hotspots" instance=ExtResource( 8 )] +[node name="Label" type="Label" parent="Hotspots/button_accept_input"] +margin_left = 731.0 +margin_top = 220.0 +margin_right = 804.0 +margin_bottom = 285.0 +rect_rotation = 6.81876 +rect_scale = Vector2( 1.35608, 2.12674 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +text = "Test +Accept + Input" +align = 1 + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/button_accept_input"] +position = Vector2( -50, -130 ) +polygon = PoolVector2Array( 787, 336, 871, 348, 856, 481, 773, 471 ) + +[node name="button_slide" type="Area2D" parent="Hotspots"] pause_mode = 1 -position = Vector2( 939.497, 154.301 ) +script = ExtResource( 7 ) global_id = "button_slide" esc_script = "res://game/rooms/room10/esc/button_slide.esc" -tooltip_name = "Test slide" +tooltip_name = "test slide" +default_action = "use" +dialog_color = Color( 1, 1, 1, 1 ) animations = null -[node name="Label" type="Label" parent="Hotspots/button_slide"] -margin_left = -9.6864 -margin_top = -28.4435 -margin_right = 66.3136 -margin_bottom = 2.55646 -custom_fonts/font = ExtResource( 3 ) -text = "Test Slide" -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="ESCLocation" type="Position2D" parent="Hotspots/button_slide"] -position = Vector2( 4.21295, 214.863 ) +[node name="slide_location" type="Position2D" parent="Hotspots/button_slide"] +position = Vector2( 899, 448 ) script = ExtResource( 5 ) global_id = "slide_location" -[node name="button_turn_to" parent="Hotspots" instance=ExtResource( 8 )] +[node name="Label" type="Label" parent="Hotspots/button_slide"] +margin_left = 854.0 +margin_top = 264.0 +margin_right = 927.0 +margin_bottom = 329.0 +rect_rotation = 0.93414 +rect_scale = Vector2( 1.15936, 1.16296 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +text = "Test +Slide" +align = 1 + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/button_slide"] +position = Vector2( 87, -140 ) +polygon = PoolVector2Array( 774, 378, 842, 378, 843, 472, 774, 471 ) + +[node name="button_turn_to" type="Area2D" parent="Hotspots"] pause_mode = 1 -position = Vector2( 1041.66, 152.721 ) +script = ExtResource( 7 ) global_id = "button_turn_to" esc_script = "res://game/rooms/room10/esc/button_turn_to.esc" tooltip_name = "Test turn_to" +default_action = "use" +dialog_color = Color( 1, 1, 1, 1 ) animations = null -[node name="Label" type="Label" parent="Hotspots/button_turn_to"] -margin_left = -14.6864 -margin_top = -26.4435 -margin_right = 80.3136 -margin_bottom = 4.55646 -custom_fonts/font = ExtResource( 3 ) -text = "Test turn_to" -__meta__ = { -"_edit_use_anchors_": false -} - [node name="ESCLocation" type="Position2D" parent="Hotspots/button_turn_to"] -position = Vector2( 4.21295, 214.863 ) +position = Vector2( 1101, 442 ) script = ExtResource( 5 ) -global_id = "slide_location" + +[node name="Label" type="Label" parent="Hotspots/button_turn_to"] +margin_left = 1059.0 +margin_top = 238.0 +margin_right = 1132.0 +margin_bottom = 303.0 +rect_rotation = 0.93414 +rect_scale = Vector2( 1.08184, 0.99822 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +text = "Test +turn_to" +align = 1 + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/button_turn_to"] +position = Vector2( 87, -140 ) +polygon = PoolVector2Array( 976, 347, 1046, 347, 1047, 440, 976, 441 ) + +[node name="button_play_sound" type="Area2D" parent="Hotspots"] +pause_mode = 1 +script = ExtResource( 7 ) +global_id = "r10_btn_play_snd" +esc_script = "res://game/rooms/room10/esc/button_play_snd.esc" +tooltip_name = "play sound" +default_action = "use" +dialog_color = Color( 1, 1, 1, 1 ) +animations = null + +[node name="ESCLocation" type="Position2D" parent="Hotspots/button_play_sound"] +position = Vector2( 988, 446 ) +script = ExtResource( 5 ) + +[node name="Label" type="Label" parent="Hotspots/button_play_sound"] +margin_left = 944.0 +margin_top = 290.0 +margin_right = 1017.0 +margin_bottom = 355.0 +rect_rotation = -64.6977 +rect_scale = Vector2( 1.60324, 1.84114 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +text = "Play +Sound" +align = 1 + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/button_play_sound"] +position = Vector2( -21, -143 ) +polygon = PoolVector2Array( 1001, 336, 1065, 365, 1027, 451, 962, 423 ) [node name="slide_pos_1" type="Position2D" parent="."] -position = Vector2( 469.097, 65.8522 ) +position = Vector2( 287, 273 ) script = ExtResource( 5 ) global_id = "slide_pos_1" @@ -224,7 +266,56 @@ script = ExtResource( 5 ) global_id = "slide_pos_2" [node name="player_start" type="Position2D" parent="."] -position = Vector2( 542.824, 468.193 ) +position = Vector2( 418, 472 ) script = ExtResource( 5 ) global_id = "r10_player_start" is_start_location = true + +[node name="player_accept_input_location" type="Position2D" parent="."] +position = Vector2( 938, 509 ) +script = ExtResource( 5 ) +global_id = "accept_input_location" + +[node name="ESCBackground" type="TextureRect" parent="."] +margin_right = 40.0 +margin_bottom = 40.0 +mouse_filter = 2 +texture = ExtResource( 10 ) +script = ExtResource( 11 ) + +[node name="room_label" type="Label" parent="ESCBackground"] +margin_right = 92.0 +margin_bottom = 21.0 +custom_fonts/font = ExtResource( 3 ) +text = "ROOM 10" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Room_overview" type="Node" parent="."] + +[node name="Polygon2D" type="Polygon2D" parent="Room_overview"] +position = Vector2( 3, -138 ) +color = Color( 1, 1, 1, 0.537255 ) +polygon = PoolVector2Array( 152, 175, 424, 175, 424, 421, 152, 421 ) + +[node name="Label" type="Label" parent="Room_overview"] +modulate = Color( 0.0352941, 0.0588235, 0.27451, 1 ) +margin_left = 163.0 +margin_top = 45.0 +margin_right = 427.0 +margin_bottom = 229.0 +text = "Room 10 demonstrates a few features +that are handy for cut-scenes. +You should hear a sound when you leave +the room, as well as when testing the +background and sound functions. +(If you don't hear anything, press ESC +and check the volume level in the game +settings menu). +Slide moves an ESCItem, ignoring walk +boundaries. Turn_to rotates the player +(or Item/NPC) to face a given direction. +Accept_input stops the player from +interracting with the game while an +ESCscript is in progress." diff --git a/game/rooms/room10/room10background.png b/game/rooms/room10/room10background.png new file mode 100644 index 00000000..98741b4e Binary files /dev/null and b/game/rooms/room10/room10background.png differ diff --git a/game/rooms/room10/walkable_area.tscn b/game/rooms/room10/walkable_area.tscn deleted file mode 100644 index 2d6b73ec..00000000 --- a/game/rooms/room10/walkable_area.tscn +++ /dev/null @@ -1,18 +0,0 @@ -[gd_scene load_steps=3 format=2] - -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1] - -[sub_resource type="NavigationPolygon" id=1] -vertices = PoolVector2Array( 1168.92, 640.557, 1182.53, 588.863, 1269.59, 622.872, 1275.03, 799.721, 129.634, 615.792, 1143.08, 613.35, -9.16094, 803.802, 84.5821, 654.06, -6.44019, 711.297, 3.15687, 646.051, 59.2201, 628.698 ) -polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 0, 3, 6, 7 ), PoolIntArray( 7, 6, 8, 9, 10 ) ] -outlines = [ PoolVector2Array( -6.44019, 711.297, 3.15687, 646.051, 59.2201, 628.698, 84.5821, 654.06, 129.634, 615.792, 1143.08, 613.35, 1168.92, 640.557, 1182.53, 588.863, 1269.59, 622.872, 1275.03, 799.721, -9.16094, 803.802 ) ] - -[node name="walkable_area" type="Navigation2D"] -script = ExtResource( 1 ) - -[node name="platform" type="NavigationPolygonInstance" parent="."] -position = Vector2( 6.73163, -264.779 ) -navpoly = SubResource( 1 ) -__meta__ = { -"_editor_description_": "" -}