diff --git a/GYMKHANA.md b/GYMKHANA.md index 3cd2fd3f..6c6333b5 100644 --- a/GYMKHANA.md +++ b/GYMKHANA.md @@ -10,4 +10,7 @@ - Generates a global variable `{list_id}_count` - `say_sequence player list_id lenght [loop]` - Generates a global variable `{list_id}_current_index` - - Generates a global variable `{list_id}_count` \ No newline at end of file + - Generates a global variable `{list_id}_count` + +## Sounds +- ZOOM0046-1239-24s-loop.ogg -> music_loop \ No newline at end of file diff --git a/gymkhana/characters/eneko/eneko_smoking.tscn b/gymkhana/characters/eneko/eneko_smoking.tscn index aa760042..e172a70c 100644 --- a/gymkhana/characters/eneko/eneko_smoking.tscn +++ b/gymkhana/characters/eneko/eneko_smoking.tscn @@ -2,22 +2,22 @@ [ext_resource path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" type="Resource" id=1] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=2] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-011.png" type="Texture" id=3] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-005.png" type="Texture" id=4] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-002.png" type="Texture" id=5] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-003.png" type="Texture" id=6] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-001.png" type="Texture" id=7] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-010.png" type="Texture" id=8] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-016.png" type="Texture" id=9] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-009.png" type="Texture" id=10] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-008.png" type="Texture" id=11] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-012.png" type="Texture" id=12] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-013.png" type="Texture" id=13] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-004.png" type="Texture" id=14] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-006.png" type="Texture" id=15] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-007.png" type="Texture" id=16] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-015.png" type="Texture" id=17] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-014.png" type="Texture" id=18] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-001.png" type="Texture" id=3] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-005.png" type="Texture" id=4] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-002.png" type="Texture" id=5] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-003.png" type="Texture" id=6] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-001.png" type="Texture" id=7] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-010.png" type="Texture" id=8] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-016.png" type="Texture" id=9] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-009.png" type="Texture" id=10] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-008.png" type="Texture" id=11] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-012.png" type="Texture" id=12] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-013.png" type="Texture" id=13] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-004.png" type="Texture" id=14] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-006.png" type="Texture" id=15] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-007.png" type="Texture" id=16] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-015.png" type="Texture" id=17] +[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-014.png" type="Texture" id=18] [ext_resource path="res://gymkhana/characters/eneko/assets/speak-2.png" type="Texture" id=20] [sub_resource type="AtlasTexture" id=2] diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-fuma-sprite.tpsheet b/gymkhana/characters/eneko/smoking_animation/eneko-fuma-sprite.tpsheet similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-fuma-sprite.tpsheet rename to gymkhana/characters/eneko/smoking_animation/eneko-fuma-sprite.tpsheet diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-001.png b/gymkhana/characters/eneko/smoking_animation/unscreen-001.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-001.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-001.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-002.png b/gymkhana/characters/eneko/smoking_animation/unscreen-002.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-002.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-002.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-003.png b/gymkhana/characters/eneko/smoking_animation/unscreen-003.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-003.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-003.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-004.png b/gymkhana/characters/eneko/smoking_animation/unscreen-004.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-004.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-004.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-005.png b/gymkhana/characters/eneko/smoking_animation/unscreen-005.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-005.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-005.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-006.png b/gymkhana/characters/eneko/smoking_animation/unscreen-006.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-006.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-006.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-007.png b/gymkhana/characters/eneko/smoking_animation/unscreen-007.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-007.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-007.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-008.png b/gymkhana/characters/eneko/smoking_animation/unscreen-008.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-008.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-008.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-009.png b/gymkhana/characters/eneko/smoking_animation/unscreen-009.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-009.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-009.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-010.png b/gymkhana/characters/eneko/smoking_animation/unscreen-010.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-010.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-010.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-011.png b/gymkhana/characters/eneko/smoking_animation/unscreen-011.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-011.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-011.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-012.png b/gymkhana/characters/eneko/smoking_animation/unscreen-012.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-012.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-012.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-013.png b/gymkhana/characters/eneko/smoking_animation/unscreen-013.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-013.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-013.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-014.png b/gymkhana/characters/eneko/smoking_animation/unscreen-014.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-014.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-014.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-015.png b/gymkhana/characters/eneko/smoking_animation/unscreen-015.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-015.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-015.png diff --git a/gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-016.png b/gymkhana/characters/eneko/smoking_animation/unscreen-016.png similarity index 100% rename from gymkhana/rooms/trasera_cocina/assets/eneko-anim/unscreen-016.png rename to gymkhana/characters/eneko/smoking_animation/unscreen-016.png diff --git a/gymkhana/rooms/home/art1.png b/gymkhana/rooms/home/art1.png deleted file mode 100644 index 21ad184a..00000000 Binary files a/gymkhana/rooms/home/art1.png and /dev/null differ diff --git a/gymkhana/rooms/home/art2.png b/gymkhana/rooms/home/art2.png deleted file mode 100644 index a0045ee5..00000000 Binary files a/gymkhana/rooms/home/art2.png and /dev/null differ diff --git a/gymkhana/rooms/home/esc/right_exit.esc b/gymkhana/rooms/home/esc/right_exit.esc deleted file mode 100644 index d3890f1c..00000000 --- a/gymkhana/rooms/home/esc/right_exit.esc +++ /dev/null @@ -1,7 +0,0 @@ -:action1 -play_snd res://game/sfx/sounds/doorOpen_2.ogg -change_scene "res://gymkhana/rooms/trasera_cocina/trasera_cocina.tscn" - -:action2 -play_snd res://game/sfx/sounds/doorOpen_2.ogg -change_scene "res://gymkhana/rooms/trasera_cocina/trasera_cocina.tscn" diff --git a/gymkhana/rooms/home/esc/right_platform.esc b/gymkhana/rooms/home/esc/right_platform.esc deleted file mode 100755 index 3940a3d7..00000000 --- a/gymkhana/rooms/home/esc/right_platform.esc +++ /dev/null @@ -1,3 +0,0 @@ -:look -say player "That's the other side." - diff --git a/gymkhana/rooms/home/esc/room01.esc b/gymkhana/rooms/home/esc/room01.esc deleted file mode 100644 index 5042d5ef..00000000 --- a/gymkhana/rooms/home/esc/room01.esc +++ /dev/null @@ -1,29 +0,0 @@ -:setup - - -> [eq ESC_LAST_SCENE room2] - teleport player r1_r_exit - # Set player look left - set_angle player 270 - stop - - -:ready - -play_snd res://game/sfx/contemplation.ogg _music - -> [!room1_visited] - set_global room1_visited true - set_global dialog_advance 0 - set_global dialog_popup_advance 0 - walk_block player r1_destination_point - wait 2 - walk_block player r1_destination_point2 - wait 2 - set_angle player 225 0.2 - wait 2 - walk_block player r1_destination_point3 - wait 1 - turn_to player r1_r_exit - - diff --git a/gymkhana/rooms/home/esc/trigger.esc b/gymkhana/rooms/home/esc/trigger.esc deleted file mode 100644 index 0555b052..00000000 --- a/gymkhana/rooms/home/esc/trigger.esc +++ /dev/null @@ -1,5 +0,0 @@ -:trigger_in - - -:trigger_out -say player "I'm near the door." diff --git a/gymkhana/rooms/home/esc/wall_item.esc b/gymkhana/rooms/home/esc/wall_item.esc deleted file mode 100755 index b36527fb..00000000 --- a/gymkhana/rooms/home/esc/wall_item.esc +++ /dev/null @@ -1,5 +0,0 @@ -:action1 -say player "Action 1 asks me to say this" - -:action2 -say player "Action 2 asks me to say this" diff --git a/gymkhana/rooms/home/esc/wall_item_popupdialog.esc b/gymkhana/rooms/home/esc/wall_item_popupdialog.esc deleted file mode 100755 index 04ddc8c6..00000000 --- a/gymkhana/rooms/home/esc/wall_item_popupdialog.esc +++ /dev/null @@ -1,13 +0,0 @@ -:look -> [eq dialog_popup_advance 0] - say player ROOM1_look_wall_item_1:"I don't know what that stuff is." avatar - set_global dialog_popup_advance 1 - stop -> [eq dialog_popup_advance 1] - say player ROOM1_look_wall_item_2:"I REALLY don't know what that stuff is." avatar - set_global dialog_popup_advance 2 - stop -> [eq dialog_popup_advance 2] - say player ROOM1_look_wall_item_3:"No, SERIOUSLY, I have no idea what that is!" avatar - say player ROOM1_look_wall_item_4:"Please stop asking me that!" avatar - stop diff --git a/gymkhana/rooms/home/home.tscn b/gymkhana/rooms/home/home.tscn deleted file mode 100644 index aaeb338e..00000000 --- a/gymkhana/rooms/home/home.tscn +++ /dev/null @@ -1,208 +0,0 @@ -[gd_scene load_steps=12 format=2] - -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=2] -[ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3] -[ext_resource path="res://gymkhana/characters/mark/mark.tscn" type="PackedScene" id=4] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.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_location.gd" type="Script" id=7] -[ext_resource path="res://gymkhana/rooms/home/room1background.png" type="Texture" id=8] -[ext_resource path="res://gymkhana/rooms/home/art2.png" type="Texture" id=9] -[ext_resource path="res://gymkhana/rooms/home/art1.png" type="Texture" id=10] - -[sub_resource type="NavigationPolygon" id=1] -vertices = PoolVector2Array( 125, 357, 1170, 355, 1277, 417, 1279, 550, -1, 548, 0, 449 ) -polygons = [ PoolIntArray( 0, 1, 2, 3, 4, 5 ) ] -outlines = [ PoolVector2Array( 125, 357, 1170, 355, 1277, 417, 1279, 550, -1, 548, 0, 449 ) ] - -[node name="room1" type="Node2D"] -script = ExtResource( 6 ) -__meta__ = { -"_edit_vertical_guides_": [ ] -} -global_id = "home" -esc_script = "res://gymkhana/rooms/home/esc/room01.esc" -player_scene = ExtResource( 4 ) -camera_limits = [ Rect2( 0, 0, 1280, 550 ) ] -editor_debug_mode = 1 - -[node name="ESCBackground" type="TextureRect" parent="."] -margin_right = 40.0 -margin_bottom = 40.0 -mouse_filter = 2 -texture = ExtResource( 8 ) -script = ExtResource( 2 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="advice2" type="Label" parent="ESCBackground"] -anchor_right = 0.023274 -anchor_bottom = 0.018018 -margin_left = 90.2752 -margin_top = 170.824 -margin_right = 298.275 -margin_bottom = 215.824 -custom_fonts/font = ExtResource( 3 ) -text = "Move : left click -Fast move : double left click" -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="room_label" type="Label" parent="ESCBackground"] -margin_left = 7.0 -margin_top = 3.0 -margin_right = 89.0 -margin_bottom = 24.0 -custom_fonts/font = ExtResource( 3 ) -text = "HOME" - -[node name="advice" type="Label" parent="ESCBackground"] -anchor_right = 0.023274 -anchor_bottom = 0.018018 -margin_left = 90.0 -margin_top = 59.0 -margin_right = 368.0 -margin_bottom = 128.0 -custom_fonts/font = ExtResource( 3 ) -text = "Don't click immediately! -Player will walk around the room, -but you can interrupt him if you want." -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="walkable_area" type="Navigation2D" parent="."] -script = ExtResource( 1 ) - -[node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="walkable_area"] -navpoly = SubResource( 1 ) - -[node name="Hotspots" type="Node2D" parent="."] - -[node name="r_door" type="Area2D" parent="Hotspots"] -pause_mode = 1 -script = ExtResource( 5 ) -global_id = "r1_r_exit" -esc_script = "res://gymkhana/rooms/home/esc/right_exit.esc" -is_exit = true -tooltip_name = "Exit to Trasera cocina" -default_action = "walk" -combine_when_selected_action_is_in = [ ] -dialog_color = Color( 1, 1, 1, 1 ) - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_door"] -polygon = PoolVector2Array( 1173, 63, 1278, 106, 1278, 420, 1172, 356 ) - -[node name="ESCLocation" type="Position2D" parent="Hotspots/r_door"] -position = Vector2( 1221, 400 ) -script = ExtResource( 7 ) - -[node name="artwork1" type="Area2D" parent="Hotspots"] -pause_mode = 1 -script = ExtResource( 5 ) -global_id = "r1_wall_item1" -esc_script = "res://gymkhana/rooms/home/esc/wall_item.esc" -tooltip_name = "This is action1" -combine_when_selected_action_is_in = [ ] -inventory_texture = ExtResource( 10 ) -dialog_color = Color( 1, 1, 1, 1 ) - -[node name="Art1" type="Sprite" parent="Hotspots/artwork1"] -position = Vector2( 470, 140 ) -texture = ExtResource( 10 ) - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/artwork1"] -position = Vector2( -84, 11.1 ) -polygon = PoolVector2Array( 487, 62, 627, 62, 627, 198, 487, 199 ) - -[node name="ESCLocation" type="Position2D" parent="Hotspots/artwork1"] -position = Vector2( 476, 385 ) -script = ExtResource( 7 ) - -[node name="Label" type="Label" parent="Hotspots/artwork1"] -margin_left = 375.422 -margin_top = 268.594 -margin_right = 657.422 -margin_bottom = 313.594 -custom_fonts/font = ExtResource( 3 ) -text = "If you look at this object, the character's -speech will appear above his head" -__meta__ = { -"_editor_description_": "" -} - -[node name="artwork2" type="Area2D" parent="Hotspots"] -pause_mode = 1 -script = ExtResource( 5 ) -global_id = "r1_wall_item2" -esc_script = "res://gymkhana/rooms/home/esc/wall_item_popupdialog.esc" -tooltip_name = "Artwork 2" -default_action = "action2" -combine_when_selected_action_is_in = [ ] -inventory_texture = ExtResource( 9 ) -dialog_color = Color( 1, 1, 1, 1 ) - -[node name="Art12" type="Sprite" parent="Hotspots/artwork2"] -position = Vector2( 830, 140 ) -texture = ExtResource( 9 ) - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/artwork2"] -position = Vector2( 273, 11 ) -polygon = PoolVector2Array( 487, 62, 627, 62, 627, 198, 487, 199 ) - -[node name="ESCLocation" type="Position2D" parent="Hotspots/artwork2"] -position = Vector2( 829, 379 ) -script = ExtResource( 7 ) - -[node name="Label2" type="Label" parent="Hotspots/artwork2"] -margin_left = 734.0 -margin_top = 269.0 -margin_right = 1020.0 -margin_bottom = 314.0 -custom_fonts/font = ExtResource( 3 ) -text = "If you look at this object, the character -will talk via a popup" -__meta__ = { -"_edit_use_anchors_": false, -"_editor_description_": "" -} - -[node name="trigger_talk" type="Area2D" parent="Hotspots"] -pause_mode = 1 -script = ExtResource( 5 ) -global_id = "trigger_talk" -esc_script = "res://gymkhana/rooms/home/esc/trigger.esc" -is_trigger = true -player_orients_on_arrival = false -combine_when_selected_action_is_in = [ ] -dialog_color = Color( 1, 1, 1, 1 ) - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/trigger_talk"] -polygon = PoolVector2Array( 1027, 352, 1187, 502, 1249.67, 445.131, 1123, 351 ) - -[node name="player_start" type="Position2D" parent="."] -position = Vector2( 172.471, 434.487 ) -script = ExtResource( 7 ) -global_id = "r1_start" -is_start_location = true - -[node name="orients_down_on_arrival" type="Position2D" parent="."] -position = Vector2( 400.129, 432.969 ) -script = ExtResource( 7 ) -global_id = "r1_destination_point" -interaction_direction = 4 - -[node name="set_angle_by_esc" type="Position2D" parent="."] -position = Vector2( 934.11, 502.959 ) -script = ExtResource( 7 ) -global_id = "r1_destination_point2" -player_orients_on_arrival = false - -[node name="turn_to_r_door_by_esc" type="Position2D" parent="."] -position = Vector2( 660.468, 381.489 ) -script = ExtResource( 7 ) -global_id = "r1_destination_point3" -player_orients_on_arrival = false diff --git a/gymkhana/rooms/home/room1background.png b/gymkhana/rooms/home/room1background.png deleted file mode 100644 index a2d5cd86..00000000 Binary files a/gymkhana/rooms/home/room1background.png and /dev/null differ diff --git a/gymkhana/rooms/interior_cocina/assets/cocina_interior_vista_completa-577h-depth.png b/gymkhana/rooms/interior_cocina/assets/cocina_interior_vista_completa-577h-depth.png deleted file mode 100644 index dcd3e16e..00000000 Binary files a/gymkhana/rooms/interior_cocina/assets/cocina_interior_vista_completa-577h-depth.png and /dev/null differ diff --git a/gymkhana/rooms/interior_cocina/assets/cocina_interior_vista_completa-577h.png b/gymkhana/rooms/interior_cocina/assets/cocina_interior_vista_completa-577h.png deleted file mode 100644 index 9f7da0dd..00000000 Binary files a/gymkhana/rooms/interior_cocina/assets/cocina_interior_vista_completa-577h.png and /dev/null differ diff --git a/gymkhana/rooms/interior_cocina/esc/interior_cocina.esc b/gymkhana/rooms/interior_cocina/esc/interior_cocina.esc deleted file mode 100644 index 1a35ebf1..00000000 --- a/gymkhana/rooms/interior_cocina/esc/interior_cocina.esc +++ /dev/null @@ -1,18 +0,0 @@ -:setup -teleport player l_start_detras -# Set player look down -set_angle player 0 -camera_set_target 0 player -stop -#> [eq ESC_LAST_SCENE trasera_cocina] -# teleport player l_start_detras - # Set player look down -# set_angle player 0 -# camera_set_target 0 player -# stop -#> [eq ESC_LAST_SCENE room5] -# teleport player r_exit -# # Set player look left -# camera_set_target 0 player -# set_angle player 270 -# stop diff --git a/gymkhana/rooms/interior_cocina/esc/salida_detras.esc b/gymkhana/rooms/interior_cocina/esc/salida_detras.esc deleted file mode 100755 index 5bf6e237..00000000 --- a/gymkhana/rooms/interior_cocina/esc/salida_detras.esc +++ /dev/null @@ -1,2 +0,0 @@ -:exit_scene -change_scene "res://gymkhana/rooms/trasera_cocina/trasera_cocina.tscn" diff --git a/gymkhana/rooms/interior_cocina/interior_cocina.tscn b/gymkhana/rooms/interior_cocina/interior_cocina.tscn deleted file mode 100644 index 1dcb4cc7..00000000 --- a/gymkhana/rooms/interior_cocina/interior_cocina.tscn +++ /dev/null @@ -1,84 +0,0 @@ -[gd_scene load_steps=11 format=2] - -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4] -[ext_resource path="res://gymkhana/rooms/interior_cocina/assets/cocina_interior_vista_completa-577h.png" type="Texture" id=5] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6] -[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=7] -[ext_resource path="res://gymkhana/rooms/interior_cocina/assets/cocina_interior_vista_completa-577h-depth.png" type="Texture" id=8] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=9] -[ext_resource path="res://gymkhana/rooms/interior_cocina/assets/grey.png" type="Texture" id=10] - -[sub_resource type="NavigationPolygon" id=1] -vertices = PoolVector2Array( 2377, 435, 2553, 380, 2595, 485, 2314, 593, 2040, 322, 2069, 370, 1600, 512, 1606, 453, 1787, 387, 1773, 499, 1634, 513, 413, 417, 543, 411, 779, 404, 839, 576, 899, 851, 484, 809, 337, 667, 275, 549, 274, 516, 2725, 472, 2745, 505, 2742, 848, 1969, 734, 1875, 634, 1510, 743, 1062, 679, 2076, 660 ) -polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 1, 0, 5 ), PoolIntArray( 6, 7, 8, 4, 5, 9, 10 ), PoolIntArray( 11, 12, 13, 14, 15, 16, 17, 18, 19 ), PoolIntArray( 3, 2, 20, 21, 22, 23 ), PoolIntArray( 10, 9, 24, 25 ), PoolIntArray( 25, 24, 23 ), PoolIntArray( 15, 14, 26 ), PoolIntArray( 15, 26, 25 ), PoolIntArray( 22, 15, 25, 23 ), PoolIntArray( 3, 23, 27 ) ] -outlines = [ PoolVector2Array( 2725, 472, 2745, 505, 2742, 848, 899, 851, 484, 809, 337, 667, 275, 549, 274, 516, 413, 417, 543, 411, 779, 404, 839, 576, 1062, 679, 1510, 743, 1634, 513, 1600, 512, 1606, 453, 1787, 387, 2040, 322, 2553, 380, 2595, 485 ), PoolVector2Array( 1773, 499, 1875, 634, 1969, 734, 2076, 660, 2314, 593, 2377, 435, 2069, 370 ) ] - -[node name="ESCRoom" type="Node2D"] -script = ExtResource( 2 ) -global_id = "interior_cocina" -player_scene = ExtResource( 7 ) -camera_limits = [ Rect2( 0, 0, 2925, 577 ) ] - -[node name="RoomBackground" type="Sprite" parent="."] -texture = ExtResource( 5 ) -centered = false -__meta__ = { -"_edit_lock_": true -} - -[node name="ESCTerrain" type="Navigation2D" parent="."] -position = Vector2( -1650, 3 ) -script = ExtResource( 4 ) -scales = ExtResource( 8 ) -scale_max = 2.0 - -[node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="ESCTerrain"] -position = Vector2( 1650, 0 ) -navpoly = SubResource( 1 ) - -[node name="start_detras" type="Position2D" parent="."] -position = Vector2( 2089, 319 ) -script = ExtResource( 3 ) -global_id = "l_start_detras" -is_start_location = true - -[node name="start_delante" type="Position2D" parent="."] -position = Vector2( 1064, 506 ) -script = ExtResource( 3 ) -global_id = "l_start_delante" - -[node name="salida_detras" type="Area2D" parent="."] -pause_mode = 1 -position = Vector2( 440, 257 ) -script = ExtResource( 6 ) -global_id = "salida_detras" -esc_script = "res://gymkhana/rooms/interior_cocina/esc/salida_detras.esc" -combine_when_selected_action_is_in = [ ] -dialog_color = Color( 1, 1, 1, 1 ) -animations = null - -[node name="ESCLocation" type="Position2D" parent="salida_detras"] -position = Vector2( 1659, 61 ) -script = ExtResource( 3 ) - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="salida_detras"] -position = Vector2( 1651, -2 ) -polygon = PoolVector2Array( -12, 69, -47, 64, -48, -96, -11, -104, 44, -95, 51, 66 ) - -[node name="ESCItem" type="Area2D" parent="."] -pause_mode = 1 -script = ExtResource( 9 ) -combine_when_selected_action_is_in = [ ] -inventory_texture = ExtResource( 10 ) -dialog_color = Color( 1, 1, 1, 1 ) -animations = null - -[node name="Sprite" type="Sprite" parent="ESCItem"] -position = Vector2( 0, -28215.5 ) -scale = Vector2( 292.6, 49.9003 ) -z_index = 1000 -texture = ExtResource( 10 ) -centered = false -offset = Vector2( 0, 577 ) diff --git a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-1500x577-noItems.jpg b/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-1500x577-noItems.jpg deleted file mode 100644 index baf6812d..00000000 Binary files a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-1500x577-noItems.jpg and /dev/null differ diff --git a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-1500x577.jpg b/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-1500x577.jpg deleted file mode 100644 index 2bc090c5..00000000 Binary files a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-1500x577.jpg and /dev/null differ diff --git a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-3122x1200-noItems.png b/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-3122x1200-noItems.png deleted file mode 100644 index c0739567..00000000 Binary files a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-3122x1200-noItems.png and /dev/null differ diff --git a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-3122x1200.jpg b/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-3122x1200.jpg deleted file mode 100644 index 67234d78..00000000 Binary files a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-3122x1200.jpg and /dev/null differ diff --git a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-height.png b/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-height.png deleted file mode 100644 index 27046983..00000000 Binary files a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-height.png and /dev/null differ diff --git a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-light.png b/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-light.png deleted file mode 100644 index bec67608..00000000 Binary files a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-light.png and /dev/null differ diff --git a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix.png b/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix.png deleted file mode 100644 index 66d8de2e..00000000 Binary files a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix.png and /dev/null differ diff --git a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina.jpg b/gymkhana/rooms/trasera_cocina/assets/background trasera cocina.jpg deleted file mode 100644 index 4ddbb39d..00000000 Binary files a/gymkhana/rooms/trasera_cocina/assets/background trasera cocina.jpg and /dev/null differ diff --git a/gymkhana/rooms/trasera_cocina/assets/columna.png b/gymkhana/rooms/trasera_cocina/assets/columna.png deleted file mode 100644 index b94e8e70..00000000 Binary files a/gymkhana/rooms/trasera_cocina/assets/columna.png and /dev/null differ diff --git a/gymkhana/rooms/trasera_cocina/assets/height-map-full-1500x577-test2.jpg b/gymkhana/rooms/trasera_cocina/assets/height-map-full-1500x577-test2.jpg deleted file mode 100644 index 57beedea..00000000 Binary files a/gymkhana/rooms/trasera_cocina/assets/height-map-full-1500x577-test2.jpg and /dev/null differ diff --git a/gymkhana/rooms/trasera_cocina/assets/height-map-full-1500x577-test3.jpg b/gymkhana/rooms/trasera_cocina/assets/height-map-full-1500x577-test3.jpg deleted file mode 100644 index 52861a2d..00000000 Binary files a/gymkhana/rooms/trasera_cocina/assets/height-map-full-1500x577-test3.jpg and /dev/null differ diff --git a/gymkhana/rooms/trasera_cocina/assets/height-map-full-1500x577.jpg b/gymkhana/rooms/trasera_cocina/assets/height-map-full-1500x577.jpg deleted file mode 100644 index 818f938d..00000000 Binary files a/gymkhana/rooms/trasera_cocina/assets/height-map-full-1500x577.jpg and /dev/null differ diff --git a/gymkhana/rooms/trasera_cocina/assets/height-map-full.jpg b/gymkhana/rooms/trasera_cocina/assets/height-map-full.jpg deleted file mode 100644 index 2c50b70f..00000000 Binary files a/gymkhana/rooms/trasera_cocina/assets/height-map-full.jpg and /dev/null differ diff --git a/gymkhana/rooms/trasera_cocina/assets/height-map.jpg b/gymkhana/rooms/trasera_cocina/assets/height-map.jpg deleted file mode 100644 index 5e6af2e0..00000000 Binary files a/gymkhana/rooms/trasera_cocina/assets/height-map.jpg and /dev/null differ diff --git a/gymkhana/rooms/trasera_cocina/esc/bombona.esc b/gymkhana/rooms/trasera_cocina/esc/bombona.esc deleted file mode 100644 index 3c7317fd..00000000 --- a/gymkhana/rooms/trasera_cocina/esc/bombona.esc +++ /dev/null @@ -1,2 +0,0 @@ -:action1 -say player "Es naranja" diff --git a/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc b/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc deleted file mode 100644 index d5194143..00000000 --- a/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc +++ /dev/null @@ -1,12 +0,0 @@ -:action1 -say player "Parece que veo a Mikel" - -:action2 -# play_snd res://game/sfx/sounds/doorOpen_2.ogg -change_scene "res://gymkhana/rooms/interior_cocina/interior_cocina.tscn" - -:action3 bombona2 -say player "¿Cómo se usa una bómbona con una puerta?" - -:action4 bombona2 -say player "No creo que les haga gracia" diff --git a/gymkhana/rooms/trasera_cocina/esc/trasera_cocina.esc b/gymkhana/rooms/trasera_cocina/esc/trasera_cocina.esc deleted file mode 100644 index d513f9cd..00000000 --- a/gymkhana/rooms/trasera_cocina/esc/trasera_cocina.esc +++ /dev/null @@ -1,2 +0,0 @@ -:ready -camera_set_target 0 player \ No newline at end of file diff --git a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn deleted file mode 100644 index dcb47147..00000000 --- a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn +++ /dev/null @@ -1,153 +0,0 @@ -[gd_scene load_steps=17 format=2] - -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/background trasera cocina-1500x577-noItems.jpg" type="Texture" id=6] -[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=7] -[ext_resource path="res://gymkhana/items/inventory/turno_cocina_bol_inventario.tscn" type="PackedScene" id=8] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/columna.png" type="Texture" id=25] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-height.png" type="Texture" id=26] -[ext_resource path="res://gymkhana/items/inventory/bombona.tscn" type="PackedScene" id=27] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=28] -[ext_resource path="res://gymkhana/items/inventory/assets/bombona-inv.png" type="Texture" id=29] -[ext_resource path="res://gymkhana/characters/eneko/eneko_smoking.tscn" type="PackedScene" id=30] -[ext_resource path="res://gymkhana/items/inventory/caja_herramientas.tscn" type="PackedScene" id=31] -[ext_resource path="res://gymkhana/items/inventory/wrench.tscn" type="PackedScene" id=32] - -[sub_resource type="NavigationPolygon" id=1] -vertices = PoolVector2Array( 155, 425, 129, 383, 242, 376, 1511, 445, 1512, 574, 193, 574, 1133, 474, 263, 374, 359, 376, 385, 397, 442, 395, 464, 432, 506, 457, 725, 472, 794, 462, 846, 467, 864, 482, 1318, 435, 1367, 411, 1425, 417, 749, 460, 584, 468, 1249, 454, 981, 480 ) -polygons = [ PoolIntArray( 0, 1, 2 ), PoolIntArray( 3, 4, 5, 6 ), PoolIntArray( 5, 0, 2, 7, 8, 9 ), PoolIntArray( 9, 10, 11, 5 ), PoolIntArray( 5, 11, 12 ), PoolIntArray( 13, 14, 15, 16, 5 ), PoolIntArray( 17, 18, 19, 3 ), PoolIntArray( 13, 20, 14 ), PoolIntArray( 5, 12, 21 ), PoolIntArray( 22, 17, 3 ), PoolIntArray( 5, 21, 13 ), PoolIntArray( 6, 22, 3 ), PoolIntArray( 23, 6, 5 ), PoolIntArray( 5, 16, 23 ) ] -outlines = [ PoolVector2Array( 263, 374, 359, 376, 385, 397, 442, 395, 464, 432, 506, 457, 584, 468, 725, 472, 749, 460, 794, 462, 846, 467, 864, 482, 981, 480, 1133, 474, 1249, 454, 1318, 435, 1367, 411, 1425, 417, 1511, 445, 1512, 574, 193, 574, 155, 425, 129, 383, 242, 376 ) ] - -[node name="ESCRoom" type="Node2D"] -script = ExtResource( 1 ) -global_id = "trasera_cocina" -esc_script = "res://gymkhana/rooms/trasera_cocina/esc/trasera_cocina.esc" -player_scene = ExtResource( 7 ) -camera_limits = [ Rect2( 0, 0, 1500, 577 ) ] -editor_debug_mode = 1 - -[node name="ESCBackground" type="TextureRect" parent="."] -margin_right = 1500.0 -margin_bottom = 755.0 -mouse_filter = 2 -texture = ExtResource( 6 ) -script = ExtResource( 2 ) - -[node name="ESCTerrain" type="Navigation2D" parent="."] -script = ExtResource( 4 ) -scales = ExtResource( 26 ) -scale_min = 0.5 - -[node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="ESCTerrain"] -navpoly = SubResource( 1 ) - -[node name="ESCLocation" type="Position2D" parent="."] -position = Vector2( 802, 470 ) -script = ExtResource( 3 ) -global_id = "trasera_cocina_start" -is_start_location = true - -[node name="Hotspots" type="Node2D" parent="."] - -[node name="entrada_cocina" type="Area2D" parent="Hotspots"] -pause_mode = 1 -script = ExtResource( 28 ) -global_id = "l_exit" -esc_script = "res://gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc" -is_exit = true -dialog_color = Color( 1, 1, 1, 1 ) -tooltips = { - "action1": "Esto es una puerta y tiene una descripcion mu larga", - "action2": "Entrar! con descricion..." -} -action3_target_texts = { -"bombona2": "Usar la bombona con la puerta?" -} -action4_target_texts = { -"bombona2": "Lanzarla contra la puerta" -} -target_when_selected_action_is_in = [ "action3", "action4" ] -animations = null - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/entrada_cocina"] -position = Vector2( 725, -125 ) -scale = Vector2( 0.963362, 0.9875 ) -polygon = PoolVector2Array( 21, 575, 22, 331, 135, 339, 137, 581 ) - -[node name="Position2D" type="Position2D" parent="Hotspots/entrada_cocina"] -position = Vector2( 748, 465 ) -script = ExtResource( 3 ) - -[node name="bombona" parent="Hotspots" instance=ExtResource( 27 )] -position = Vector2( 583, 414 ) -script = ExtResource( 28 ) -global_id = "bombona" -esc_script = "res://gymkhana/rooms/trasera_cocina/esc/bombona.esc" -tooltip_name = "Mirar bombona" -inventory_texture = ExtResource( 29 ) -dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Mirar bombona" -tooltips = { - "action1": "Mirar bombona" -} -animations = null - -[node name="bombona2" parent="Hotspots" instance=ExtResource( 27 )] -position = Vector2( 355, 409 ) -script = ExtResource( 28 ) -global_id = "bombona2" -esc_script = "res://gymkhana/items/inventory/bombona2.esc" -inventory_texture = ExtResource( 29 ) -dialog_color = Color( 1, 1, 1, 1 ) -tooltips = { - "action1": "Mirar bombona", - "action2": "Coger bombona", - "action3": "Usar", - "action4": "¿Por qué es un dibujo animado?" -} -animations = null - -[node name="Columna" type="Sprite" parent="."] -position = Vector2( 235, 294.5 ) -scale = Vector2( 0.973684, 1.02358 ) -z_index = 400 -texture = ExtResource( 25 ) - -[node name="EnekoSmoking" parent="." instance=ExtResource( 30 )] -position = Vector2( 959, 413 ) -tooltip_name = "Objervar sujeto" -dialog_color = Color( 0, 1, 0.462745, 1 ) -tooltips = { - "action1": "Objervar sujeto", - "action2": "Hablar" -} -action3_target_texts = { -"bombona2": "Toma, un regalo", -"caja_herramientas": "Regalar" -} -target_when_selected_action_is_in = [ "action3" ] -selectable = true - -[node name="ESCLocation" type="Position2D" parent="EnekoSmoking"] -position = Vector2( -169, 179 ) -script = ExtResource( 3 ) -global_id = "eneko_smoking" - -[node name="caja_herramientas" parent="." instance=ExtResource( 31 )] -position = Vector2( 707, 422 ) -combine_when_selected_action_is_in = PoolStringArray( ) - -[node name="wrench" parent="." instance=ExtResource( 32 )] -position = Vector2( 507, 522 ) -combine_when_selected_action_is_in = PoolStringArray( ) - -[node name="ESCItemWithTooltip@ESCLocation" type="Position2D" parent="."] -position = Vector2( -51, 69 ) -script = ExtResource( 3 ) -global_id = "caja_herramientas" - -[node name="turno_cocina_bol_inventario" parent="." instance=ExtResource( 8 )] -position = Vector2( 343, 479 ) diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn index 448ce65f..e2ba61c0 100644 --- a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn @@ -7,7 +7,7 @@ [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png" type="Texture" id=7] -[ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/columna.png" type="Texture" id=8] +[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/columna.png" type="Texture" id=8] [sub_resource type="NavigationPolygon" id=1] vertices = PoolVector2Array( -1104, 183, -1146, 112, -1013, 114, -864, 131, -787, 150, -717, 189, 44, 171, 37, 137, 169, 158, 177, 170, 184, 248, 169, 316, 246, 170, 246, 233, -236, 229, -1093, 316, -598, 200, -852, 111, -790, 115, -519, 186, -392, 198 ) diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc b/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc index d304a252..79918edb 100644 --- a/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc +++ b/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc @@ -1,3 +1,3 @@ :action1 -play__lib_snd puerta_cocina_detras +play_lib_snd puerta_cocina_detras change_scene "res://gymkhana/rooms/turno_cocina/cocina/cocina.tscn" diff --git a/gymkhana/sounds/music_loop.mp3 b/gymkhana/sounds/music_loop.mp3 new file mode 100644 index 00000000..22d205ec Binary files /dev/null and b/gymkhana/sounds/music_loop.mp3 differ diff --git a/gymkhana/sounds/music-loop.ogg b/gymkhana/sounds/music_loop.ogg similarity index 100% rename from gymkhana/sounds/music-loop.ogg rename to gymkhana/sounds/music_loop.ogg diff --git a/gymkhana/start_game.esc b/gymkhana/start_game.esc index f7ad42e8..6ae089a8 100644 --- a/gymkhana/start_game.esc +++ b/gymkhana/start_game.esc @@ -3,10 +3,9 @@ # change_scene res://gymkhana/rooms/intro/intro_room.tscn false show_menu main # When control is passed back after the logo, start the music -play_snd res://game/sfx/Game-Menu_Looping.mp3 _music +play_snd res://gymkhana/sounds/music_loop.ogg _music :newgame # 1/ Simple scene set_global new_game true change_scene res://gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn -# play_snd "res://gymkhana/sounds/music-loop.ogg" _music \ No newline at end of file