From 1d9c45881fab90fd9beb6b57524206cb18dcc1f3 Mon Sep 17 00:00:00 2001 From: dariasteam Date: Mon, 3 Sep 2018 08:51:41 +0100 Subject: [PATCH 1/7] Add toggle music option --- Locales/locales.csv | 2 + Locales/locales.en.xl | Bin 6272 -> 6328 bytes Locales/locales.es.xl | Bin 6996 -> 7052 bytes Scenes/Events/music.gd | 6 ++ Scenes/Maps/map_0.tscn | 53 ++++++++-------- Scenes/Maps/map_1.tscn | 26 ++++---- Scenes/Maps/map_2.tscn | 30 ++++----- Scenes/Maps/map_3.tscn | 22 ++++--- Scenes/Maps/map_4.tscn | 34 +++++++---- Scenes/Maps/map_5.tscn | 98 ++++++++++++++--------------- Scenes/Maps/map_6.tscn | 90 ++++++++++++++------------- Scenes/Maps/map_7.tscn | 79 +++++++++++++----------- Scenes/Maps/map_8.tscn | 122 +++++++++++++++++++------------------ Scenes/Menu/global.gd | 10 ++- Scenes/Menu/main_menu.tscn | 28 +++++---- Scenes/Menu/settings.tscn | 74 +++++++++++++++++++++- 16 files changed, 401 insertions(+), 273 deletions(-) create mode 100644 Scenes/Events/music.gd diff --git a/Locales/locales.csv b/Locales/locales.csv index f905cee..5dae7dd 100644 --- a/Locales/locales.csv +++ b/Locales/locales.csv @@ -4,6 +4,8 @@ SETTINGS,Ajustes,Settings ABOUT,Info,About SWITCH_SCREEN_CONTROLS,Usar botones táctiles,Use onsceen controls SWITCH_RETRO_EFFECT,Emular pantalla retro,Simulate retro TV +SWITCH_MUSIC,Música,Music +SWITCH_SOUND,Sonidos,Sounds BTTN_BACK,Volver,Back TEXT_LICENSE,"El código fuente de este juego está licenciado bajo Geneal Public License versión 3. Todos los recursos gráficos, sonidos y música han sido creados por nosotos y están licenciados como Creative Commons Attribution-NonCommercial-ShareAlike 4.0. La tipografía utilizada es Press Start 2P creada por CodeMan38 (Open Font License) diff --git a/Locales/locales.en.xl b/Locales/locales.en.xl index 6cacdffac692b9785140e48838eb804f4ce1fbb0..48642b50b7905ccb150d5bf2d76caede0040ad80 100644 GIT binary patch literal 6328 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 diff --git a/Locales/locales.es.xl b/Locales/locales.es.xl index 5a8e91672fdea2c7bcfdf8906bf688b853efd81e..e653492735b70a04c5942beb93456474f160c56c 100644 GIT binary patch delta 3792 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 C&=isY diff --git a/Scenes/Events/music.gd b/Scenes/Events/music.gd new file mode 100644 index 0000000..bb2ed34 --- /dev/null +++ b/Scenes/Events/music.gd @@ -0,0 +1,6 @@ +extends StreamPlayer + +func _ready(): + print (global.music) + if global.music: + play(0) diff --git a/Scenes/Maps/map_0.tscn b/Scenes/Maps/map_0.tscn index 303ef6d..5107b0e 100644 --- a/Scenes/Maps/map_0.tscn +++ b/Scenes/Maps/map_0.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=1] +[gd_scene load_steps=16 format=1] [ext_resource path="res://Scenes/Maps/tileset.xml" type="TileSet" id=1] [ext_resource path="res://Sprites/Background/night_outside_d.png" type="Texture" id=2] @@ -12,8 +12,9 @@ [ext_resource path="res://Scenes/Events/death_line.tscn" type="PackedScene" id=10] [ext_resource path="res://Scenes/Events/UFO.tscn" type="PackedScene" id=11] [ext_resource path="res://Music/dangerous-hills-loop.ogg" type="AudioStream" id=12] -[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=13] -[ext_resource path="res://Scenes/Events/on_map_text_dialog.tscn" type="PackedScene" id=14] +[ext_resource path="res://Scenes/Events/music.gd" type="Script" id=13] +[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=14] +[ext_resource path="res://Scenes/Events/on_map_text_dialog.tscn" type="PackedScene" id=15] [node name="Level" type="Node2D" groups=[ "level", @@ -1153,119 +1154,121 @@ stream/stream = ExtResource( 12 ) stream/play = false stream/loop = true stream/volume_db = 1.0 -stream/autoplay = true +stream/autoplay = false stream/paused = false stream/loop_restart_time = 0.0 stream/buffering_ms = 500 +script/script = ExtResource( 13 ) [node name="Cages" type="Node2D" parent="."] editor/display_folded = true -[node name="jail" parent="Cages" instance=ExtResource( 13 )] +[node name="jail" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1920, -2640 ) transform/scale = Vector2( 1.7, 1.7 ) [node name="Tips" type="Node2D" parent="."] +editor/display_folded = true transform/pos = Vector2( -1890, -3020 ) -[node name="Area2D" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D" parent="Tips" instance=ExtResource( 15 )] text = "TUT_0" -[node name="Area2D1" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D1" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 640, 20 ) text = "TUT_1" -[node name="Area2D2" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D2" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 1520, 30 ) text = "TUT_2" -[node name="Area2D3" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D3" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 2110, 30 ) text = "TUT_3" -[node name="Area2D4" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D4" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 2550, 30 ) text = "TUT_4" -[node name="Area2D5" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D5" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 2550, -370 ) text = "TUT_5" -[node name="Area2D6" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D6" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 3570, -60 ) text = "TUT_6" -[node name="Area2D7" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D7" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 3900, -60 ) text = "TUT_7" -[node name="Area2D8" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D8" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 4010, 370 ) text = "TUT_8" -[node name="Area2D19" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D19" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 4340, 730 ) text = "TUT_9" -[node name="Area2D9" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D9" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 4790, 1050 ) text = "TUT_10" -[node name="Area2D10" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D10" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 4920, 1340 ) text = "TUT_11" -[node name="Area2D11" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D11" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 4300, 1790 ) text = "TUT_12" -[node name="Area2D12" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D12" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 3560, 1790 ) text = "TUT_13" -[node name="Area2D13" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D13" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 3590, 700 ) text = "TUT_14" -[node name="Area2D14" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D14" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 2940, 370 ) text = "TUT_15" -[node name="Area2D15" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D15" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 1380, 500 ) text = "TUT_16" -[node name="Area2D16" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D16" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 380, 370 ) text = "TUT_17" -[node name="Area2D17" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D17" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( -340, -710 ) text = "TUT_18" -[node name="Area2D18" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D18" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( -340, -60 ) text = "TUT_19" diff --git a/Scenes/Maps/map_1.tscn b/Scenes/Maps/map_1.tscn index 3fa4c3e..b3ad932 100644 --- a/Scenes/Maps/map_1.tscn +++ b/Scenes/Maps/map_1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=1] +[gd_scene load_steps=15 format=1] [ext_resource path="res://Scenes/Maps/tileset.xml" type="TileSet" id=1] [ext_resource path="res://Sprites/Background/night_outside_d.png" type="Texture" id=2] @@ -12,7 +12,8 @@ [ext_resource path="res://Scenes/Events/death_line.tscn" type="PackedScene" id=10] [ext_resource path="res://Scenes/Events/UFO.tscn" type="PackedScene" id=11] [ext_resource path="res://Music/dangerous-hills-loop.ogg" type="AudioStream" id=12] -[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=13] +[ext_resource path="res://Scenes/Events/music.gd" type="Script" id=13] +[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=14] [node name="Level" type="Node2D" groups=[ "level", @@ -1558,56 +1559,57 @@ stream/stream = ExtResource( 12 ) stream/play = false stream/loop = true stream/volume_db = 1.0 -stream/autoplay = true +stream/autoplay = false stream/paused = false stream/loop_restart_time = 0.0 stream/buffering_ms = 500 +script/script = ExtResource( 13 ) [node name="Cages" type="Node2D" parent="."] editor/display_folded = true -[node name="jail" parent="Cages" instance=ExtResource( 13 )] +[node name="jail" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1250, -2410 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail1" parent="Cages" instance=ExtResource( 13 )] +[node name="jail1" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1450, -2100 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail2" parent="Cages" instance=ExtResource( 13 )] +[node name="jail2" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -950, -2100 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail3" parent="Cages" instance=ExtResource( 13 )] +[node name="jail3" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -640, -2100 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail4" parent="Cages" instance=ExtResource( 13 )] +[node name="jail4" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -2000, -2100 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail5" parent="Cages" instance=ExtResource( 13 )] +[node name="jail5" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1850, -1560 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail6" parent="Cages" instance=ExtResource( 13 )] +[node name="jail6" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1520, -1560 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail7" parent="Cages" instance=ExtResource( 13 )] +[node name="jail7" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1090, -1560 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail8" parent="Cages" instance=ExtResource( 13 )] +[node name="jail8" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -660, -1560 ) transform/scale = Vector2( 1.7, 1.7 ) diff --git a/Scenes/Maps/map_2.tscn b/Scenes/Maps/map_2.tscn index a186e55..668459f 100644 --- a/Scenes/Maps/map_2.tscn +++ b/Scenes/Maps/map_2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=1] +[gd_scene load_steps=15 format=1] [ext_resource path="res://Scenes/Maps/tileset.xml" type="TileSet" id=1] [ext_resource path="res://Sprites/Background/night_outside_d.png" type="Texture" id=2] @@ -12,7 +12,8 @@ [ext_resource path="res://Scenes/Events/death_line.tscn" type="PackedScene" id=10] [ext_resource path="res://Scenes/Events/UFO.tscn" type="PackedScene" id=11] [ext_resource path="res://Music/dangerous-hills-loop.ogg" type="AudioStream" id=12] -[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=13] +[ext_resource path="res://Scenes/Events/music.gd" type="Script" id=13] +[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=14] [node name="Level" type="Node2D"] @@ -2042,66 +2043,67 @@ stream/stream = ExtResource( 12 ) stream/play = false stream/loop = true stream/volume_db = 1.0 -stream/autoplay = true +stream/autoplay = false stream/paused = false stream/loop_restart_time = 0.0 stream/buffering_ms = 500 +script/script = ExtResource( 13 ) [node name="Cages" type="Node2D" parent="."] editor/display_folded = true -[node name="jail" parent="Cages" instance=ExtResource( 13 )] +[node name="jail" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1410, -2210 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail1" parent="Cages" instance=ExtResource( 13 )] +[node name="jail1" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1890, -2210 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail2" parent="Cages" instance=ExtResource( 13 )] +[node name="jail2" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -3170, -3080 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail3" parent="Cages" instance=ExtResource( 13 )] +[node name="jail3" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -2640, -470 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail4" parent="Cages" instance=ExtResource( 13 )] +[node name="jail4" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( 1900, -1770 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail5" parent="Cages" instance=ExtResource( 13 )] +[node name="jail5" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( 3690, -2760 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail6" parent="Cages" instance=ExtResource( 13 )] +[node name="jail6" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( 4670, -1880 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail7" parent="Cages" instance=ExtResource( 13 )] +[node name="jail7" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( 2270, -3300 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail10" parent="Cages" instance=ExtResource( 13 )] +[node name="jail10" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -720, -1660 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail8" parent="Cages" instance=ExtResource( 13 )] +[node name="jail8" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( 650, -2100 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail9" parent="Cages" instance=ExtResource( 13 )] +[node name="jail9" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( 2550, -1530 ) transform/scale = Vector2( 1.7, 1.7 ) diff --git a/Scenes/Maps/map_3.tscn b/Scenes/Maps/map_3.tscn index 63263d7..67e4c61 100644 --- a/Scenes/Maps/map_3.tscn +++ b/Scenes/Maps/map_3.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=1] +[gd_scene load_steps=16 format=1] [ext_resource path="res://Scenes/Maps/tileset.xml" type="TileSet" id=1] [ext_resource path="res://Sprites/Background/night_outside_d.png" type="Texture" id=2] @@ -12,8 +12,9 @@ [ext_resource path="res://Scenes/Events/death_line.tscn" type="PackedScene" id=10] [ext_resource path="res://Scenes/Events/UFO.tscn" type="PackedScene" id=11] [ext_resource path="res://Music/dangerous-hills-loop.ogg" type="AudioStream" id=12] -[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=13] -[ext_resource path="res://Scenes/Events/on_map_text_dialog.tscn" type="PackedScene" id=14] +[ext_resource path="res://Scenes/Events/music.gd" type="Script" id=13] +[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=14] +[ext_resource path="res://Scenes/Events/on_map_text_dialog.tscn" type="PackedScene" id=15] [node name="Level" type="Node2D" groups=[ "level", @@ -1374,29 +1375,32 @@ stream/stream = ExtResource( 12 ) stream/play = false stream/loop = true stream/volume_db = 1.0 -stream/autoplay = true +stream/autoplay = false stream/paused = false stream/loop_restart_time = 0.0 stream/buffering_ms = 500 +script/script = ExtResource( 13 ) [node name="Cages" type="Node2D" parent="."] -[node name="jail" parent="Cages" instance=ExtResource( 13 )] +editor/display_folded = true + +[node name="jail" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( 1910, -790 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail1" parent="Cages" instance=ExtResource( 13 )] +[node name="jail1" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( 2650, -790 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail2" parent="Cages" instance=ExtResource( 13 )] +[node name="jail2" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( 604.4, -1095.6 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail3" parent="Cages" instance=ExtResource( 13 )] +[node name="jail3" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( 1360, -880 ) transform/scale = Vector2( 1.7, 1.7 ) @@ -1405,7 +1409,7 @@ transform/scale = Vector2( 1.7, 1.7 ) transform/pos = Vector2( -1890, -3020 ) -[node name="Area2D" parent="Tips" instance=ExtResource( 14 )] +[node name="Area2D" parent="Tips" instance=ExtResource( 15 )] transform/pos = Vector2( 4340, 1360 ) text = "MAP3_TEXT0" diff --git a/Scenes/Maps/map_4.tscn b/Scenes/Maps/map_4.tscn index fed69b4..fcff6a2 100644 --- a/Scenes/Maps/map_4.tscn +++ b/Scenes/Maps/map_4.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=1] +[gd_scene load_steps=15 format=1] [ext_resource path="res://Scenes/Maps/tileset.xml" type="TileSet" id=1] [ext_resource path="res://Sprites/Background/night_outside_d.png" type="Texture" id=2] @@ -12,7 +12,8 @@ [ext_resource path="res://Scenes/Events/death_line.tscn" type="PackedScene" id=10] [ext_resource path="res://Scenes/Events/UFO.tscn" type="PackedScene" id=11] [ext_resource path="res://Music/dangerous-hills-loop.ogg" type="AudioStream" id=12] -[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=13] +[ext_resource path="res://Scenes/Events/music.gd" type="Script" id=13] +[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=14] [node name="Level" type="Node2D" groups=[ "level", @@ -205,6 +206,7 @@ region_rect = Rect2( -1000, 0, 2048, 128 ) [node name="enemies" type="Node2D" parent="."] +editor/display_folded = true transform/pos = Vector2( 2140, -960 ) transform/scale = Vector2( 1.7, 1.7 ) @@ -260,6 +262,7 @@ transform/scale = Vector2( 1, 1 ) [node name="apples" type="Node2D" parent="."] +editor/display_folded = true transform/pos = Vector2( -3140, -3460 ) [node name="Apple" parent="apples" instance=ExtResource( 7 )] @@ -304,6 +307,8 @@ amount = 20 [node name="hearts" type="Node2D" parent="."] +editor/display_folded = true + [node name="Heart" parent="hearts" instance=ExtResource( 8 )] transform/pos = Vector2( -1250, -3930 ) @@ -1750,59 +1755,62 @@ stream/stream = ExtResource( 12 ) stream/play = false stream/loop = true stream/volume_db = 1.0 -stream/autoplay = true +stream/autoplay = false stream/paused = false stream/loop_restart_time = 0.0 stream/buffering_ms = 500 +script/script = ExtResource( 13 ) [node name="Cages" type="Node2D" parent="."] -[node name="jail" parent="Cages" instance=ExtResource( 13 )] +editor/display_folded = true + +[node name="jail" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1590, -2620 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail2" parent="Cages" instance=ExtResource( 13 )] +[node name="jail2" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1905.6, -3075.6 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail3" parent="Cages" instance=ExtResource( 13 )] +[node name="jail3" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1631.6, -3410.6 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail1" parent="Cages" instance=ExtResource( 13 )] +[node name="jail1" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1140, -2640 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail4" parent="Cages" instance=ExtResource( 13 )] +[node name="jail4" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -690, -2210 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail5" parent="Cages" instance=ExtResource( 13 )] +[node name="jail5" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -3700, -3840 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail6" parent="Cages" instance=ExtResource( 13 )] +[node name="jail6" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -495.771, -3402.32 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail7" parent="Cages" instance=ExtResource( 13 )] +[node name="jail7" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -660, -1890 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail8" parent="Cages" instance=ExtResource( 13 )] +[node name="jail8" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -2350, -2290 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail9" parent="Cages" instance=ExtResource( 13 )] +[node name="jail9" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1630, -1230 ) transform/scale = Vector2( 1.7, 1.7 ) diff --git a/Scenes/Maps/map_5.tscn b/Scenes/Maps/map_5.tscn index 8420fdb..e11b725 100644 --- a/Scenes/Maps/map_5.tscn +++ b/Scenes/Maps/map_5.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=1] +[gd_scene load_steps=20 format=1] [ext_resource path="res://Scenes/Maps/tileset.xml" type="TileSet" id=1] [ext_resource path="res://Sprites/Background/night_outside_d.png" type="Texture" id=2] @@ -12,8 +12,9 @@ [ext_resource path="res://Scenes/Events/death_line.tscn" type="PackedScene" id=10] [ext_resource path="res://Scenes/Events/UFO.tscn" type="PackedScene" id=11] [ext_resource path="res://Music/dangerous-hills-loop.ogg" type="AudioStream" id=12] -[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=13] -[ext_resource path="res://Sprites/Tilesets/tile full.png" type="Texture" id=14] +[ext_resource path="res://Scenes/Events/music.gd" type="Script" id=13] +[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=14] +[ext_resource path="res://Sprites/Tilesets/tile full.png" type="Texture" id=15] [sub_resource type="Curve2D" id=1] @@ -2167,79 +2168,80 @@ stream/stream = ExtResource( 12 ) stream/play = false stream/loop = true stream/volume_db = 1.0 -stream/autoplay = true +stream/autoplay = false stream/paused = false stream/loop_restart_time = 0.0 stream/buffering_ms = 500 +script/script = ExtResource( 13 ) [node name="cages" type="Node2D" parent="."] -[node name="jail" parent="cages" instance=ExtResource( 13 )] +[node name="jail" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -280, -3300 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail1" parent="cages" instance=ExtResource( 13 )] +[node name="jail1" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( 820, -3300 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail7" parent="cages" instance=ExtResource( 13 )] +[node name="jail7" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( 1800, -3080 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail8" parent="cages" instance=ExtResource( 13 )] +[node name="jail8" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( 4.4, -5355.6 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail9" parent="cages" instance=ExtResource( 13 )] +[node name="jail9" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( 1314.4, -5355.6 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail11" parent="cages" instance=ExtResource( 13 )] +[node name="jail11" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1200, -5360 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail12" parent="cages" instance=ExtResource( 13 )] +[node name="jail12" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -840, -5360 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail2" parent="cages" instance=ExtResource( 13 )] +[node name="jail2" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -870, -4170 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail3" parent="cages" instance=ExtResource( 13 )] +[node name="jail3" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -870, -3840 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail10" parent="cages" instance=ExtResource( 13 )] +[node name="jail10" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( 2180, -4160 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail4" parent="cages" instance=ExtResource( 13 )] +[node name="jail4" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1460, -2670 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail5" parent="cages" instance=ExtResource( 13 )] +[node name="jail5" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -920, -2670 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail6" parent="cages" instance=ExtResource( 13 )] +[node name="jail6" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -2500, -3840 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail13" parent="cages" instance=ExtResource( 13 )] +[node name="jail13" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( 1900, -3840 ) transform/scale = Vector2( 1.7, 1.7 ) @@ -2292,7 +2294,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/platform1/Path2D/PathFollow2D/platform"] -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 45 @@ -2300,7 +2302,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/platform1/Path2D/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 45 @@ -2308,7 +2310,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/platform1/Path2D/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 43 @@ -2317,7 +2319,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 39 @@ -2325,7 +2327,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/platform1/Path2D/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 50 @@ -2393,7 +2395,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/platform3/Path2D/PathFollow2D/platform"] -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 45 @@ -2401,7 +2403,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/platform3/Path2D/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 45 @@ -2409,7 +2411,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/platform3/Path2D/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 43 @@ -2418,7 +2420,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 39 @@ -2426,7 +2428,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/platform3/Path2D/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 50 @@ -2494,7 +2496,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/platform4/Path2D/PathFollow2D/platform"] -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 45 @@ -2502,7 +2504,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/platform4/Path2D/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 45 @@ -2510,7 +2512,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/platform4/Path2D/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 43 @@ -2519,7 +2521,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 39 @@ -2527,7 +2529,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/platform4/Path2D/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 50 @@ -2595,7 +2597,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/platform6/Path2D/PathFollow2D/platform"] -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 45 @@ -2603,7 +2605,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/platform6/Path2D/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 45 @@ -2611,7 +2613,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/platform6/Path2D/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 43 @@ -2620,7 +2622,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 39 @@ -2628,7 +2630,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/platform6/Path2D/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 50 @@ -2695,7 +2697,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/platform2/Path2D 2/PathFollow2D/platform"] -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 45 @@ -2703,7 +2705,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/platform2/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 45 @@ -2711,7 +2713,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/platform2/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 43 @@ -2720,7 +2722,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 39 @@ -2728,7 +2730,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/platform2/Path2D 2/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 50 @@ -2794,7 +2796,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/platform5/Path2D 2/PathFollow2D/platform"] -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 45 @@ -2802,7 +2804,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/platform5/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 45 @@ -2810,7 +2812,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/platform5/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 43 @@ -2819,7 +2821,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 39 @@ -2827,7 +2829,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/platform5/Path2D 2/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 14 ) +texture = ExtResource( 15 ) vframes = 13 hframes = 5 frame = 50 diff --git a/Scenes/Maps/map_6.tscn b/Scenes/Maps/map_6.tscn index c949570..940f132 100644 --- a/Scenes/Maps/map_6.tscn +++ b/Scenes/Maps/map_6.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=1] +[gd_scene load_steps=25 format=1] [ext_resource path="res://Scenes/Maps/tileset.xml" type="TileSet" id=1] [ext_resource path="res://Sprites/Background/night_outside_d.png" type="Texture" id=2] @@ -12,10 +12,11 @@ [ext_resource path="res://Scenes/Events/death_line.tscn" type="PackedScene" id=10] [ext_resource path="res://Scenes/Events/UFO.tscn" type="PackedScene" id=11] [ext_resource path="res://Music/dangerous-hills-loop.ogg" type="AudioStream" id=12] -[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=13] -[ext_resource path="res://Scenes/Events/on_map_text_dialog.tscn" type="PackedScene" id=14] -[ext_resource path="res://Sprites/Tilesets/tile full.png" type="Texture" id=15] -[ext_resource path="res://Scenes/Events/poison_smoke.tscn" type="PackedScene" id=16] +[ext_resource path="res://Scenes/Events/music.gd" type="Script" id=13] +[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=14] +[ext_resource path="res://Scenes/Events/on_map_text_dialog.tscn" type="PackedScene" id=15] +[ext_resource path="res://Sprites/Tilesets/tile full.png" type="Texture" id=16] +[ext_resource path="res://Scenes/Events/poison_smoke.tscn" type="PackedScene" id=17] [sub_resource type="Curve2D" id=1] @@ -291,6 +292,7 @@ region_rect = Rect2( -1000, 0, 2048, 128 ) [node name="enemies" type="Node2D" parent="."] +editor/display_folded = true transform/pos = Vector2( 2140, -960 ) transform/scale = Vector2( 1.7, 1.7 ) @@ -331,6 +333,7 @@ transform/scale = Vector2( 1, 1 ) [node name="apples" type="Node2D" parent="."] +editor/display_folded = true transform/pos = Vector2( -3140, -3460 ) [node name="Apple" parent="apples" instance=ExtResource( 7 )] @@ -1790,83 +1793,84 @@ stream/stream = ExtResource( 12 ) stream/play = false stream/loop = true stream/volume_db = 1.0 -stream/autoplay = true +stream/autoplay = false stream/paused = false stream/loop_restart_time = 0.0 stream/buffering_ms = 500 +script/script = ExtResource( 13 ) [node name="cages" type="Node2D" parent="."] editor/display_folded = true -[node name="jail" parent="cages" instance=ExtResource( 13 )] +[node name="jail" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1570, -2640 ) transform/scale = Vector2( 1.7, 1.7 ) keys_size = 56 -[node name="jail4" parent="cages" instance=ExtResource( 13 )] +[node name="jail4" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -760, -2970 ) transform/scale = Vector2( 1.7, 1.7 ) one_way_collision/max_depth = -12.157 keys_size = 56 -[node name="jail1" parent="cages" instance=ExtResource( 13 )] +[node name="jail1" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -920, -2640 ) transform/scale = Vector2( 1.7, 1.7 ) keys_size = 56 -[node name="jail10" parent="cages" instance=ExtResource( 13 )] +[node name="jail10" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( 510, -770 ) transform/scale = Vector2( 1.7, 1.7 ) keys_size = 56 -[node name="jail2" parent="cages" instance=ExtResource( 13 )] +[node name="jail2" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -2460, -1970 ) transform/scale = Vector2( 1.7, 1.7 ) keys_size = 56 -[node name="jail8" parent="cages" instance=ExtResource( 13 )] +[node name="jail8" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( 0, -2970 ) transform/scale = Vector2( 1.7, 1.7 ) keys_size = 56 -[node name="jail3" parent="cages" instance=ExtResource( 13 )] +[node name="jail3" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1590, -3300 ) transform/scale = Vector2( 1.7, 1.7 ) keys_size = 56 -[node name="jail5" parent="cages" instance=ExtResource( 13 )] +[node name="jail5" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -680, -2210 ) transform/scale = Vector2( 1.7, 1.7 ) keys_size = 56 -[node name="jail6" parent="cages" instance=ExtResource( 13 )] +[node name="jail6" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -220, -1770 ) transform/scale = Vector2( 1.7, 1.7 ) keys_size = 56 -[node name="jail7" parent="cages" instance=ExtResource( 13 )] +[node name="jail7" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1580, -1010 ) transform/scale = Vector2( 1.7, 1.7 ) keys_size = 56 -[node name="jail9" parent="cages" instance=ExtResource( 13 )] +[node name="jail9" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -2010, -2730 ) transform/scale = Vector2( 1.7, 1.7 ) keys_size = 56 -[node name="jail11" parent="cages" instance=ExtResource( 13 )] +[node name="jail11" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -2650, -1560 ) transform/scale = Vector2( 1.7, 1.7 ) @@ -1877,7 +1881,7 @@ keys_size = 56 editor/display_folded = true transform/pos = Vector2( -1890, -3020 ) -[node name="Area2D" parent="tips" instance=ExtResource( 14 )] +[node name="Area2D" parent="tips" instance=ExtResource( 15 )] text = "Este camino está bloqueado. Busca otra forma de desplazarte." @@ -1925,7 +1929,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/Node2D/Path2D 2/PathFollow2D/platform"] -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 45 @@ -1933,7 +1937,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/Node2D/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 45 @@ -1941,7 +1945,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/Node2D/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 43 @@ -1950,7 +1954,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 39 @@ -1958,7 +1962,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/Node2D/Path2D 2/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 50 @@ -2024,7 +2028,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/moving_platform/Path2D 2/PathFollow2D/platform"] -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 45 @@ -2032,7 +2036,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/moving_platform/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 45 @@ -2040,7 +2044,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/moving_platform/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 43 @@ -2049,7 +2053,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 39 @@ -2057,7 +2061,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/moving_platform/Path2D 2/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 50 @@ -2122,7 +2126,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/moving_platform1/Path2D/PathFollow2D/platform"] -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 45 @@ -2130,7 +2134,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/moving_platform1/Path2D/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 45 @@ -2138,7 +2142,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/moving_platform1/Path2D/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 43 @@ -2147,7 +2151,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 39 @@ -2155,7 +2159,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/moving_platform1/Path2D/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 50 @@ -2183,48 +2187,48 @@ _update_shape_index = 0 [node name="poison_smoke" type="Node2D" parent="."] -[node name="smoke" parent="poison_smoke" instance=ExtResource( 16 )] +[node name="smoke" parent="poison_smoke" instance=ExtResource( 17 )] transform/pos = Vector2( -1690, -2160 ) time = 2.0 -[node name="smoke3" parent="poison_smoke" instance=ExtResource( 16 )] +[node name="smoke3" parent="poison_smoke" instance=ExtResource( 17 )] transform/pos = Vector2( -810, -2160 ) time = 2.0 -[node name="smoke1" parent="poison_smoke" instance=ExtResource( 16 )] +[node name="smoke1" parent="poison_smoke" instance=ExtResource( 17 )] transform/pos = Vector2( -600, -3030 ) time = 1.0 -[node name="smoke2" parent="poison_smoke" instance=ExtResource( 16 )] +[node name="smoke2" parent="poison_smoke" instance=ExtResource( 17 )] transform/pos = Vector2( -380, -3030 ) time = 2.0 -[node name="smoke4" parent="poison_smoke" instance=ExtResource( 16 )] +[node name="smoke4" parent="poison_smoke" instance=ExtResource( 17 )] transform/pos = Vector2( -170, -3020 ) time = 1.0 -[node name="smoke5" parent="poison_smoke" instance=ExtResource( 16 )] +[node name="smoke5" parent="poison_smoke" instance=ExtResource( 17 )] transform/pos = Vector2( -490, -1720 ) time = 0.5 -[node name="smoke6" parent="poison_smoke" instance=ExtResource( 16 )] +[node name="smoke6" parent="poison_smoke" instance=ExtResource( 17 )] transform/pos = Vector2( -380, -1720 ) time = 1.0 -[node name="smoke7" parent="poison_smoke" instance=ExtResource( 16 )] +[node name="smoke7" parent="poison_smoke" instance=ExtResource( 17 )] transform/pos = Vector2( -2740, -810 ) transform/rot = -90.0 time = 2.0 -[node name="smoke8" parent="poison_smoke" instance=ExtResource( 16 )] +[node name="smoke8" parent="poison_smoke" instance=ExtResource( 17 )] transform/pos = Vector2( 240, -920 ) transform/rot = 90.0 diff --git a/Scenes/Maps/map_7.tscn b/Scenes/Maps/map_7.tscn index ab791e1..27b7cdb 100644 --- a/Scenes/Maps/map_7.tscn +++ b/Scenes/Maps/map_7.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=1] +[gd_scene load_steps=21 format=1] [ext_resource path="res://Scenes/Maps/tileset.xml" type="TileSet" id=1] [ext_resource path="res://Sprites/Background/night_outside_d.png" type="Texture" id=2] @@ -12,10 +12,11 @@ [ext_resource path="res://Scenes/Events/death_line.tscn" type="PackedScene" id=10] [ext_resource path="res://Scenes/Events/UFO.tscn" type="PackedScene" id=11] [ext_resource path="res://Music/dangerous-hills-loop.ogg" type="AudioStream" id=12] -[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=13] -[ext_resource path="res://Scenes/Events/on_map_text_dialog.tscn" type="PackedScene" id=14] -[ext_resource path="res://Sprites/Tilesets/tile full.png" type="Texture" id=15] -[ext_resource path="res://Scenes/Events/poison_smoke.tscn" type="PackedScene" id=16] +[ext_resource path="res://Scenes/Events/music.gd" type="Script" id=13] +[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=14] +[ext_resource path="res://Scenes/Events/on_map_text_dialog.tscn" type="PackedScene" id=15] +[ext_resource path="res://Sprites/Tilesets/tile full.png" type="Texture" id=16] +[ext_resource path="res://Scenes/Events/poison_smoke.tscn" type="PackedScene" id=17] [sub_resource type="Curve2D" id=1] @@ -245,6 +246,7 @@ region_rect = Rect2( -1000, 0, 2048, 128 ) [node name="enemies" type="Node2D" parent="."] +editor/display_folded = true transform/pos = Vector2( 2140, -960 ) transform/scale = Vector2( 1.7, 1.7 ) @@ -295,6 +297,7 @@ transform/scale = Vector2( 1, 1 ) [node name="apples" type="Node2D" parent="."] +editor/display_folded = true transform/pos = Vector2( -3140, -3460 ) [node name="Apple" parent="apples" instance=ExtResource( 7 )] @@ -314,6 +317,8 @@ amount = 20 [node name="hearts" type="Node2D" parent="."] +editor/display_folded = true + [node name="Heart" parent="hearts" instance=ExtResource( 8 )] transform/pos = Vector2( 1480, -1230 ) @@ -332,6 +337,7 @@ transform/pos = Vector2( -354, -3068 ) [node name="cowbells" type="Node2D" parent="."] +editor/display_folded = true transform/pos = Vector2( 500, 560 ) [node name="Cowbell" parent="cowbells" instance=ExtResource( 9 )] @@ -2418,81 +2424,82 @@ stream/stream = ExtResource( 12 ) stream/play = false stream/loop = true stream/volume_db = 1.0 -stream/autoplay = true +stream/autoplay = false stream/paused = false stream/loop_restart_time = 0.0 stream/buffering_ms = 500 +script/script = ExtResource( 13 ) [node name="cages" type="Node2D" parent="."] editor/display_folded = true -[node name="jail" parent="cages" instance=ExtResource( 13 )] +[node name="jail" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1690, -2730 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail1" parent="cages" instance=ExtResource( 13 )] +[node name="jail1" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1685, -3278 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail2" parent="cages" instance=ExtResource( 13 )] +[node name="jail2" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1113, -2516 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail3" parent="cages" instance=ExtResource( 13 )] +[node name="jail3" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( 336, -2402 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail4" parent="cages" instance=ExtResource( 13 )] +[node name="jail4" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -30, -1420 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail5" parent="cages" instance=ExtResource( 13 )] +[node name="jail5" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( 580, -1420 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail6" parent="cages" instance=ExtResource( 13 )] +[node name="jail6" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1869, -1859 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail7" parent="cages" instance=ExtResource( 13 )] +[node name="jail7" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( 1270, -1870 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail8" parent="cages" instance=ExtResource( 13 )] +[node name="jail8" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( 1635, -1666 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail9" parent="cages" instance=ExtResource( 13 )] +[node name="jail9" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1902, -2623 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail10" parent="cages" instance=ExtResource( 13 )] +[node name="jail10" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( 817, -3078 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail11" parent="cages" instance=ExtResource( 13 )] +[node name="jail11" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -2012, -912 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail12" parent="cages" instance=ExtResource( 13 )] +[node name="jail12" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( -818, -472 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail13" parent="cages" instance=ExtResource( 13 )] +[node name="jail13" parent="cages" instance=ExtResource( 14 )] transform/pos = Vector2( 1030, -2620 ) transform/scale = Vector2( 1.7, 1.7 ) @@ -2501,7 +2508,7 @@ transform/scale = Vector2( 1.7, 1.7 ) transform/pos = Vector2( -1890, -3020 ) -[node name="Area2D" parent="tips" instance=ExtResource( 14 )] +[node name="Area2D" parent="tips" instance=ExtResource( 15 )] transform/pos = Vector2( -306, 72 ) text = "Este camino está bloqueado. Busca otra forma de desplazarte." @@ -2550,7 +2557,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/Node2D/Path2D/PathFollow2D/platform"] -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 45 @@ -2558,7 +2565,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/Node2D/Path2D/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 45 @@ -2566,7 +2573,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/Node2D/Path2D/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 43 @@ -2575,7 +2582,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 39 @@ -2583,7 +2590,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/Node2D/Path2D/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 50 @@ -2649,7 +2656,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/Node2D1/Path2D/PathFollow2D/platform"] -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 45 @@ -2657,7 +2664,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/Node2D1/Path2D/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 45 @@ -2665,7 +2672,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/Node2D1/Path2D/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 43 @@ -2674,7 +2681,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 39 @@ -2682,7 +2689,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/Node2D1/Path2D/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 15 ) +texture = ExtResource( 16 ) vframes = 13 hframes = 5 frame = 50 @@ -2710,33 +2717,33 @@ _update_shape_index = 0 [node name="smoke" type="Node2D" parent="."] -[node name="smoke" parent="smoke" instance=ExtResource( 16 )] +[node name="smoke" parent="smoke" instance=ExtResource( 17 )] transform/pos = Vector2( -1641, -2992 ) transform/rot = 270.0 time = -1.0 -[node name="smoke1" parent="smoke" instance=ExtResource( 16 )] +[node name="smoke1" parent="smoke" instance=ExtResource( 17 )] transform/pos = Vector2( -1188, -3100 ) transform/rot = 90.0 transform/scale = Vector2( -1.7, 1.7 ) time = 10.0 -[node name="smoke2" parent="smoke" instance=ExtResource( 16 )] +[node name="smoke2" parent="smoke" instance=ExtResource( 17 )] transform/pos = Vector2( 598, -2820 ) transform/scale = Vector2( -1.7, 1.7 ) time = 1.0 -[node name="smoke3" parent="smoke" instance=ExtResource( 16 )] +[node name="smoke3" parent="smoke" instance=ExtResource( 17 )] transform/pos = Vector2( 970, -1688 ) transform/rot = 270.0 transform/scale = Vector2( -1.7, 1.7 ) time = 1.0 -[node name="smoke4" parent="smoke" instance=ExtResource( 16 )] +[node name="smoke4" parent="smoke" instance=ExtResource( 17 )] transform/pos = Vector2( -2383, -1686 ) transform/rot = 90.0 diff --git a/Scenes/Maps/map_8.tscn b/Scenes/Maps/map_8.tscn index cba3609..0e88f85 100644 --- a/Scenes/Maps/map_8.tscn +++ b/Scenes/Maps/map_8.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=37 format=1] +[gd_scene load_steps=38 format=1] [ext_resource path="res://Scenes/Maps/tileset.xml" type="TileSet" id=1] [ext_resource path="res://Sprites/Background/night_outside_d.png" type="Texture" id=2] @@ -19,12 +19,13 @@ [ext_resource path="res://Sound/UFO_abduct.ogg" type="AudioStream" id=17] [ext_resource path="res://Fonts/pixelated_regular.fnt" type="BitmapFont" id=18] [ext_resource path="res://Music/dangerous-hills-loop.ogg" type="AudioStream" id=19] -[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=20] -[ext_resource path="res://Scenes/Events/on_map_text_dialog.tscn" type="PackedScene" id=21] -[ext_resource path="res://Sprites/Tilesets/tile full.png" type="Texture" id=22] -[ext_resource path="res://Scenes/Events/poison_smoke.tscn" type="PackedScene" id=23] -[ext_resource path="res://Sprites/Effects/darkness_border.png" type="Texture" id=24] -[ext_resource path="res://Sprites/Effects/darkness.png" type="Texture" id=25] +[ext_resource path="res://Scenes/Events/music.gd" type="Script" id=20] +[ext_resource path="res://Scenes/Events/jail.tscn" type="PackedScene" id=21] +[ext_resource path="res://Scenes/Events/on_map_text_dialog.tscn" type="PackedScene" id=22] +[ext_resource path="res://Sprites/Tilesets/tile full.png" type="Texture" id=23] +[ext_resource path="res://Scenes/Events/poison_smoke.tscn" type="PackedScene" id=24] +[ext_resource path="res://Sprites/Effects/darkness_border.png" type="Texture" id=25] +[ext_resource path="res://Sprites/Effects/darkness.png" type="Texture" id=26] [sub_resource type="Animation" id=1] @@ -461,6 +462,7 @@ transform/pos = Vector2( -5100, -720 ) [node name="cowbells" type="Node2D" parent="."] +editor/display_folded = true transform/pos = Vector2( 500, 560 ) [node name="Cowbell" parent="cowbells" instance=ExtResource( 9 )] @@ -2333,6 +2335,7 @@ transform/scale = Vector2( 6889, 1 ) [node name="UFO" type="Node2D" parent="."] +editor/display_folded = true transform/pos = Vector2( -2074.8, -3239.33 ) transform/scale = Vector2( 1.7, 1.7 ) @@ -2768,86 +2771,87 @@ stream/stream = ExtResource( 19 ) stream/play = false stream/loop = true stream/volume_db = 1.0 -stream/autoplay = true +stream/autoplay = false stream/paused = false stream/loop_restart_time = 0.0 stream/buffering_ms = 500 +script/script = ExtResource( 20 ) [node name="cages" type="Node2D" parent="."] editor/display_folded = true -[node name="jail" parent="cages" instance=ExtResource( 20 )] +[node name="jail" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( -2060.55, -2429.5 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail1" parent="cages" instance=ExtResource( 20 )] +[node name="jail1" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( -2752.84, -2864.33 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail2" parent="cages" instance=ExtResource( 20 )] +[node name="jail2" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( -3545.78, -1530.53 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail3" parent="cages" instance=ExtResource( 20 )] +[node name="jail3" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( -819.772, -1232.94 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail4" parent="cages" instance=ExtResource( 20 )] +[node name="jail4" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( -2233.49, -901.092 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail5" parent="cages" instance=ExtResource( 20 )] +[node name="jail5" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( -1690, -800 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail6" parent="cages" instance=ExtResource( 20 )] +[node name="jail6" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( -4200, -160 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail7" parent="cages" instance=ExtResource( 20 )] +[node name="jail7" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( -1940, 210 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail8" parent="cages" instance=ExtResource( 20 )] +[node name="jail8" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( -5250, -1670 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail9" parent="cages" instance=ExtResource( 20 )] +[node name="jail9" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( 90, -2320 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail10" parent="cages" instance=ExtResource( 20 )] +[node name="jail10" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( -920, -2650 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail11" parent="cages" instance=ExtResource( 20 )] +[node name="jail11" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( -610, -2650 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail12" parent="cages" instance=ExtResource( 20 )] +[node name="jail12" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( -3420, 420 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail13" parent="cages" instance=ExtResource( 20 )] +[node name="jail13" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( -4180, 420 ) transform/scale = Vector2( 1.7, 1.7 ) -[node name="jail14" parent="cages" instance=ExtResource( 20 )] +[node name="jail14" parent="cages" instance=ExtResource( 21 )] transform/pos = Vector2( -4880, -1240 ) transform/scale = Vector2( 1.7, 1.7 ) @@ -2857,7 +2861,7 @@ transform/scale = Vector2( 1.7, 1.7 ) editor/display_folded = true transform/pos = Vector2( 1080, -3720 ) -[node name="Area2D" parent="tips" instance=ExtResource( 21 )] +[node name="Area2D" parent="tips" instance=ExtResource( 22 )] text = "Este camino está bloqueado. Busca otra forma de desplazarte." @@ -2904,7 +2908,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/Node2D/Path2D/PathFollow2D/platform"] -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 45 @@ -2912,7 +2916,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/Node2D/Path2D/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 45 @@ -2920,7 +2924,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/Node2D/Path2D/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 43 @@ -2929,7 +2933,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 39 @@ -2937,7 +2941,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/Node2D/Path2D/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 50 @@ -2974,7 +2978,7 @@ curve = SubResource( 11 ) [node name="PathFollow2D" type="PathFollow2D" parent="moving_paltforms/Node2D1/Path2D 2"] -transform/pos = Vector2( 820, -410.79 ) +transform/pos = Vector2( 820, -409.87 ) transform/rot = -179.531 offset = 620.742 h_offset = 0.0 @@ -3003,7 +3007,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/Node2D1/Path2D 2/PathFollow2D/platform"] -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 45 @@ -3011,7 +3015,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/Node2D1/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 45 @@ -3019,7 +3023,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/Node2D1/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 43 @@ -3028,7 +3032,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 39 @@ -3036,7 +3040,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/Node2D1/Path2D 2/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 50 @@ -3073,7 +3077,7 @@ curve = SubResource( 11 ) [node name="PathFollow2D" type="PathFollow2D" parent="moving_paltforms/Node2D2/Path2D 2"] -transform/pos = Vector2( 820, -410.79 ) +transform/pos = Vector2( 820, -409.87 ) transform/rot = -179.531 offset = 620.742 h_offset = 0.0 @@ -3102,7 +3106,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/Node2D2/Path2D 2/PathFollow2D/platform"] -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 45 @@ -3110,7 +3114,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/Node2D2/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 45 @@ -3118,7 +3122,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/Node2D2/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 43 @@ -3127,7 +3131,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 39 @@ -3135,7 +3139,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/Node2D2/Path2D 2/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 50 @@ -3172,7 +3176,7 @@ curve = SubResource( 11 ) [node name="PathFollow2D" type="PathFollow2D" parent="moving_paltforms/Node2D3/Path2D 2"] -transform/pos = Vector2( 820, -410.79 ) +transform/pos = Vector2( 820, -409.87 ) transform/rot = -179.531 offset = 620.742 h_offset = 0.0 @@ -3201,7 +3205,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/Node2D3/Path2D 2/PathFollow2D/platform"] -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 45 @@ -3209,7 +3213,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/Node2D3/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 45 @@ -3217,7 +3221,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/Node2D3/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 43 @@ -3226,7 +3230,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 39 @@ -3234,7 +3238,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/Node2D3/Path2D 2/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 50 @@ -3271,7 +3275,7 @@ curve = SubResource( 11 ) [node name="PathFollow2D" type="PathFollow2D" parent="moving_paltforms/Node2D4/Path2D 2"] -transform/pos = Vector2( 820, -410.79 ) +transform/pos = Vector2( 820, -409.87 ) transform/rot = -179.531 offset = 620.742 h_offset = 0.0 @@ -3300,7 +3304,7 @@ transform/scale = Vector2( 1.7, 1.7 ) [node name="Sprite" type="Sprite" parent="moving_paltforms/Node2D4/Path2D 2/PathFollow2D/platform"] -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 45 @@ -3308,7 +3312,7 @@ frame = 45 [node name="Sprite3" type="Sprite" parent="moving_paltforms/Node2D4/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( -63.9978, -0.524231 ) -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 45 @@ -3316,7 +3320,7 @@ frame = 45 [node name="Sprite1" type="Sprite" parent="moving_paltforms/Node2D4/Path2D 2/PathFollow2D/platform"] transform/pos = Vector2( 63.9979, 0.524231 ) -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 43 @@ -3325,7 +3329,7 @@ frame = 43 transform/pos = Vector2( -127.996, -1.04849 ) transform/rot = 3.57518e-06 -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 39 @@ -3333,7 +3337,7 @@ frame = 39 [node name="Sprite4" type="Sprite" parent="moving_paltforms/Node2D4/Path2D 2/PathFollow2D/platform"] transform/rot = 3.57518e-06 -texture = ExtResource( 22 ) +texture = ExtResource( 23 ) vframes = 13 hframes = 5 frame = 50 @@ -3361,25 +3365,25 @@ _update_shape_index = 0 [node name="smoke" type="Node2D" parent="."] -[node name="smoke" parent="smoke" instance=ExtResource( 23 )] +[node name="smoke" parent="smoke" instance=ExtResource( 24 )] transform/pos = Vector2( -1252.09, -2621.29 ) transform/rot = 180.0 time = 1.0 -[node name="smoke1" parent="smoke" instance=ExtResource( 23 )] +[node name="smoke1" parent="smoke" instance=ExtResource( 24 )] transform/pos = Vector2( -3103.18, -3165.35 ) transform/rot = 180.0 time = 1.0 -[node name="smoke2" parent="smoke" instance=ExtResource( 23 )] +[node name="smoke2" parent="smoke" instance=ExtResource( 24 )] transform/pos = Vector2( -2994.88, -2839.55 ) transform/rot = 180.0 time = 2.5 -[node name="smoke3" parent="smoke" instance=ExtResource( 23 )] +[node name="smoke3" parent="smoke" instance=ExtResource( 24 )] transform/pos = Vector2( -2994.88, -2403.7 ) transform/rot = 180.0 @@ -3391,7 +3395,7 @@ visibility/light_mask = 14 transform/pos = Vector2( -190, -2570 ) transform/scale = Vector2( 114.865, 2.36304 ) z/z = 1 -texture = ExtResource( 24 ) +texture = ExtResource( 25 ) [node name="fog" type="Sprite" parent="fog_border"] @@ -3399,7 +3403,7 @@ visibility/light_mask = 14 transform/pos = Vector2( 0.0175053, 846.367 ) transform/scale = Vector2( 1, 12.4971 ) z/z = 1 -texture = ExtResource( 25 ) +texture = ExtResource( 26 ) [connection signal="body_enter" from="UFO/player_spawner/Area2D" to="UFO/player_spawner" method="_on_Area2D_body_enter"] diff --git a/Scenes/Menu/global.gd b/Scenes/Menu/global.gd index f3e2301..de64cd4 100644 --- a/Scenes/Menu/global.gd +++ b/Scenes/Menu/global.gd @@ -13,6 +13,8 @@ var milk_buyed = 0 var can_show_in_game_menu = true var retro_effect = true +var music = true +var sound = true var level = 0 var unlocked_levels = 1 @@ -76,7 +78,10 @@ func save_game(): life = life, milk_buyed = milk_buyed, hearts_buyed = hearts_buyed, - retro_effect=retro_effect + retro_effect=retro_effect, + # NEW STUFF + sound=sound, + music=music } save_game.store_line(data.to_json()) save_game.close() @@ -104,4 +109,7 @@ func load_game(): retro_effect = current_line["retro_effect"] + if (current_line.has("sound")): + sound = current_line["sound"] + music = current_line["music"] \ No newline at end of file diff --git a/Scenes/Menu/main_menu.tscn b/Scenes/Menu/main_menu.tscn index 66590b5..6769f7d 100644 --- a/Scenes/Menu/main_menu.tscn +++ b/Scenes/Menu/main_menu.tscn @@ -1,13 +1,14 @@ -[gd_scene load_steps=10 format=1] +[gd_scene load_steps=11 format=1] [ext_resource path="res://Sprites/GUI/Buttons/btn_shoot.png" type="Texture" id=1] [ext_resource path="res://Fonts/pixelated_title.fnt" type="BitmapFont" id=2] [ext_resource path="res://Scenes/Menu/bttn_play.gd" type="Script" id=3] [ext_resource path="res://Scenes/Menu/about_button.gd" type="Script" id=4] [ext_resource path="res://Music/dangerous_hills.ogg" type="AudioStream" id=5] -[ext_resource path="res://Sprites/GUI/title_base.png" type="Texture" id=6] -[ext_resource path="res://Sprites/GUI/title_revenge.png" type="Texture" id=7] -[ext_resource path="res://Sprites/Effects/leche.png" type="Texture" id=8] +[ext_resource path="res://Scenes/Events/music.gd" type="Script" id=6] +[ext_resource path="res://Sprites/GUI/title_base.png" type="Texture" id=7] +[ext_resource path="res://Sprites/GUI/title_revenge.png" type="Texture" id=8] +[ext_resource path="res://Sprites/Effects/leche.png" type="Texture" id=9] [sub_resource type="GDScript" id=1] @@ -112,29 +113,32 @@ text = "ABOUT" flat = false script/script = ExtResource( 4 ) -[node name="StreamPlayer" type="StreamPlayer" parent="."] +[node name="StreamPlayer" type="StreamPlayer" parent="." groups=[ +"music", +]] stream/stream = ExtResource( 5 ) stream/play = false stream/loop = false stream/volume_db = 5.0 -stream/autoplay = true +stream/autoplay = false stream/paused = false stream/loop_restart_time = 0.0 stream/buffering_ms = 500 +script/script = ExtResource( 6 ) [node name="Base" type="Sprite" parent="."] transform/pos = Vector2( 1.07855, -1.84071 ) transform/scale = Vector2( 0.0864583, 0.128739 ) z/z = -1 -texture = ExtResource( 6 ) +texture = ExtResource( 7 ) [node name="Revenge" type="Sprite" parent="."] transform/pos = Vector2( 1.87856, -1.84071 ) transform/scale = Vector2( 0.0864583, 0.128739 ) -texture = ExtResource( 7 ) +texture = ExtResource( 8 ) [node name="Particles2D" type="Particles2D" parent="."] @@ -147,7 +151,7 @@ config/amount = 8 config/lifetime = 2.5 config/preprocess = 1.0 config/process_mode = 1 -config/texture = ExtResource( 8 ) +config/texture = ExtResource( 9 ) params/direction = 0.0 params/spread = 1.0 params/linear_velocity = 500.0 @@ -179,7 +183,7 @@ config/amount = 8 config/lifetime = 2.5 config/preprocess = 1.0 config/process_mode = 1 -config/texture = ExtResource( 8 ) +config/texture = ExtResource( 9 ) params/direction = 0.0 params/spread = 1.0 params/linear_velocity = 500.0 @@ -211,7 +215,7 @@ config/amount = 6 config/lifetime = 2.5 config/preprocess = 1.0 config/process_mode = 1 -config/texture = ExtResource( 8 ) +config/texture = ExtResource( 9 ) params/direction = 0.0 params/spread = 1.0 params/linear_velocity = 500.0 @@ -243,7 +247,7 @@ config/amount = 6 config/lifetime = 2.5 config/preprocess = 1.0 config/process_mode = 1 -config/texture = ExtResource( 8 ) +config/texture = ExtResource( 9 ) params/direction = 0.0 params/spread = 1.0 params/linear_velocity = 500.0 diff --git a/Scenes/Menu/settings.tscn b/Scenes/Menu/settings.tscn index b6d1a11..11b6f24 100644 --- a/Scenes/Menu/settings.tscn +++ b/Scenes/Menu/settings.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=1] +[gd_scene load_steps=9 format=1] [ext_resource path="res://Fonts/pixelated_regular.fnt" type="BitmapFont" id=1] [ext_resource path="res://Scenes/Menu/button_back.tscn" type="PackedScene" id=2] @@ -29,6 +29,34 @@ func _ready(): func _on_CheckButton1_toggled( pressed ): global.retro_effect = !pressed + + +func _on_CheckButton3_toggled( pressed ): + pass # replace with function body +" + +[sub_resource type="GDScript" id=3] + +script/source = "extends CheckButton + +func _ready(): + set_pressed(global.music) + +func _on_CheckButton2_toggled( pressed ): + global.music = !global.music + +" + +[sub_resource type="GDScript" id=4] + +script/source = "extends CheckButton + +func _ready(): + set_pressed(global.sound) + +func _on_CheckButton2_toggled( pressed ): + global.sound = !global.sound + " [node name="Control" type="Control"] @@ -110,6 +138,46 @@ flat = false align = 0 script/script = SubResource( 2 ) +[node name="CheckButton2" type="CheckButton" parent="Panel/VButtonArray"] + +rect/scale = Vector2( 2, 2 ) +focus/ignore_mouse = false +focus/stop_mouse = true +size_flags/horizontal = 2 +size_flags/vertical = 2 +margin/left = 96.0 +margin/top = 134.0 +margin/right = 502.0 +margin/bottom = 173.0 +custom_fonts/font = ExtResource( 1 ) +toggle_mode = true +enabled_focus_mode = 2 +shortcut = null +text = "SWITCH_MUSIC" +flat = false +align = 0 +script/script = SubResource( 3 ) + +[node name="CheckButton3" type="CheckButton" parent="Panel/VButtonArray"] + +rect/scale = Vector2( 2, 2 ) +focus/ignore_mouse = false +focus/stop_mouse = true +size_flags/horizontal = 2 +size_flags/vertical = 2 +margin/left = 95.0 +margin/top = 207.0 +margin/right = 501.0 +margin/bottom = 246.0 +custom_fonts/font = ExtResource( 1 ) +toggle_mode = true +enabled_focus_mode = 2 +shortcut = null +text = "SWITCH_SOUND" +flat = false +align = 0 +script/script = SubResource( 4 ) + [node name="Button" parent="Panel/VButtonArray" instance=ExtResource( 2 )] margin/left = 372.0 @@ -140,4 +208,8 @@ max_lines_visible = -1 [connection signal="toggled" from="Panel/VButtonArray/CheckButton1" to="Panel/VButtonArray/CheckButton1" method="_on_CheckButton1_toggled"] +[connection signal="toggled" from="Panel/VButtonArray/CheckButton2" to="Panel/VButtonArray/CheckButton2" method="_on_CheckButton2_toggled"] + +[connection signal="toggled" from="Panel/VButtonArray/CheckButton3" to="Panel/VButtonArray/CheckButton3" method="_on_CheckButton3_toggled"] + From 74394a5e4f56ece881d538c9f8357ff8fc465b25 Mon Sep 17 00:00:00 2001 From: dariasteam Date: Mon, 3 Sep 2018 09:08:22 +0100 Subject: [PATCH 2/7] Add toggle sound option --- Scenes/Events/apple.gd | 3 ++- Scenes/Events/cage.tres.gd | 3 ++- Scenes/Events/cowbell_collector.gd | 4 +++- Scenes/Events/enemy_1.gd | 3 ++- Scenes/Events/enemy_1.tscn | 2 +- Scenes/Events/enemy_2.gd | 3 ++- Scenes/Events/enemy_2.tscn | 2 +- Scenes/Events/heart.gd | 3 ++- Scenes/Events/jail.tscn | 2 +- Scenes/Events/milk_bullet.gd | 10 ++++++---- Scenes/Events/milk_ray.gd | 6 ++++-- Scenes/Events/music.gd | 3 +-- Scenes/Events/player.gd | 5 +++-- Scenes/Events/player_spawner.gd | 9 ++++++--- Scenes/Events/sound.gd | 1 + Scenes/Maps/map_0.tscn | 2 -- Scenes/Menu/settings.tscn | 6 ++---- 17 files changed, 39 insertions(+), 28 deletions(-) create mode 100644 Scenes/Events/sound.gd diff --git a/Scenes/Events/apple.gd b/Scenes/Events/apple.gd index 899aeb7..b667daa 100644 --- a/Scenes/Events/apple.gd +++ b/Scenes/Events/apple.gd @@ -11,7 +11,8 @@ func _ready(): func _on_Apple_body_enter( body ): if(body.is_in_group("player")): body.add_milk(amount) - sound.play() + if global.sound: + sound.play() sprite.set_opacity(0) diff --git a/Scenes/Events/cage.tres.gd b/Scenes/Events/cage.tres.gd index 966a43b..9df8df3 100644 --- a/Scenes/Events/cage.tres.gd +++ b/Scenes/Events/cage.tres.gd @@ -21,7 +21,8 @@ func open_cage(): get_tree().get_nodes_in_group("player_spawner")[0].update_text() - sound.play() + if global.sound: + sound.play() text_label.set_text( texts[rand_range(0, texts.size())]) text_anim.play("Apear") diff --git a/Scenes/Events/cowbell_collector.gd b/Scenes/Events/cowbell_collector.gd index 5a30bf4..3266625 100644 --- a/Scenes/Events/cowbell_collector.gd +++ b/Scenes/Events/cowbell_collector.gd @@ -45,7 +45,9 @@ func play_sound(): add_child(sample_player) sample_player.add_child(aux_timer) - sample_player.play("cowbell_sound") + if global.sound: + sample_player.play("cowbell_sound") + aux_timer.start() timer.start() diff --git a/Scenes/Events/enemy_1.gd b/Scenes/Events/enemy_1.gd index 993fd44..a81ec87 100644 --- a/Scenes/Events/enemy_1.gd +++ b/Scenes/Events/enemy_1.gd @@ -59,7 +59,8 @@ func on_opacity_high (): func play_damage_sound(): var sample_list = sound.get_sample_library().get_sample_list() var sample = sample_list[rand_range(0, sample_list.size())] - sound.play(sample, 0) + if global.sound: + sound.play(sample, 0) func decrease_life (value): play_damage_sound() diff --git a/Scenes/Events/enemy_1.tscn b/Scenes/Events/enemy_1.tscn index 40f25cb..d5d68f5 100644 --- a/Scenes/Events/enemy_1.tscn +++ b/Scenes/Events/enemy_1.tscn @@ -63,8 +63,8 @@ offsets = FloatArray( 0, 1 ) colors = ColorArray( 0.773438, 0.773438, 0.773438, 1, 0.1875, 0.1875, 0.1875, 1 ) [node name="KinematicBody2D 2" type="KinematicBody2D" groups=[ -"enemy_1", "enemy", +"enemy_1", ]] transform/pos = Vector2( 64.3, -80 ) diff --git a/Scenes/Events/enemy_2.gd b/Scenes/Events/enemy_2.gd index 3b6e46c..c66ae1e 100644 --- a/Scenes/Events/enemy_2.gd +++ b/Scenes/Events/enemy_2.gd @@ -65,7 +65,8 @@ func on_opacity_high (): func play_damage_sound(): var sample_list = sound.get_sample_library().get_sample_list() var sample = sample_list[rand_range(0, sample_list.size())] - sound.play(sample, 0) + if global.sound: + sound.play(sample, 0) func decrease_life (value): play_damage_sound() diff --git a/Scenes/Events/enemy_2.tscn b/Scenes/Events/enemy_2.tscn index b618337..b0b0196 100644 --- a/Scenes/Events/enemy_2.tscn +++ b/Scenes/Events/enemy_2.tscn @@ -63,8 +63,8 @@ offsets = FloatArray( 0, 1 ) colors = ColorArray( 0.773438, 0.773438, 0.773438, 1, 0.1875, 0.1875, 0.1875, 1 ) [node name="KinematicBody2D 2" type="KinematicBody2D" groups=[ -"enemy_1", "enemy", +"enemy_1", ]] transform/pos = Vector2( 64.3, -80 ) diff --git a/Scenes/Events/heart.gd b/Scenes/Events/heart.gd index 826130c..24f942c 100644 --- a/Scenes/Events/heart.gd +++ b/Scenes/Events/heart.gd @@ -14,4 +14,5 @@ func _on_Area2D_body_enter( body ): sprite.set_opacity(0) disconnect("body_enter",self,"_on_Area2D_body_enter") body.add_life() - sound.play() + if global.sound: + sound.play() diff --git a/Scenes/Events/jail.tscn b/Scenes/Events/jail.tscn index 88a4e92..19c50b6 100644 --- a/Scenes/Events/jail.tscn +++ b/Scenes/Events/jail.tscn @@ -99,7 +99,7 @@ stream/buffering_ms = 500 frames = SubResource( 2 ) animation = "Idle" -frame = 4 +frame = 15 playing = true [node name="Bars" type="Particles2D" parent="."] diff --git a/Scenes/Events/milk_bullet.gd b/Scenes/Events/milk_bullet.gd index 7c3e6a5..d0976aa 100644 --- a/Scenes/Events/milk_bullet.gd +++ b/Scenes/Events/milk_bullet.gd @@ -22,8 +22,9 @@ func destroy(): yield(t, "timeout") queue_free() -func _ready(): - sound.play("bullet_sound",0) +func _ready(): + if global.sound: + sound.play("bullet_sound",0) t.set_wait_time(LIFE_TIME) t.set_one_shot(true) self.add_child(t) @@ -38,5 +39,6 @@ func _on_RigidBody2D_body_enter( body ): elif (end): destroy() -func _on_RigidBody2D_body_enter_shape( body_id, body, body_shape, local_shape ): - sound.play("bullet_sound", 0) +func _on_RigidBody2D_body_enter_shape( body_id, body, body_shape, local_shape ): + if global.sound: + sound.play("bullet_sound", 0) diff --git a/Scenes/Events/milk_ray.gd b/Scenes/Events/milk_ray.gd index 000fdb0..be1ee52 100644 --- a/Scenes/Events/milk_ray.gd +++ b/Scenes/Events/milk_ray.gd @@ -37,7 +37,8 @@ func enable(): end.get_node("Area2D").enable() origin.set_emitting(true) middle.set_opacity(1) - sound.play() + if global.sound: + sound.play() set_process(true) func disable(): @@ -45,7 +46,8 @@ func disable(): end.set_emitting(false) end.get_node("Area2D").disable() middle.set_opacity(0) - sound.stop() + if global.sound: + sound.stop() set_process(false) func _process(delta): diff --git a/Scenes/Events/music.gd b/Scenes/Events/music.gd index bb2ed34..2b93e60 100644 --- a/Scenes/Events/music.gd +++ b/Scenes/Events/music.gd @@ -1,6 +1,5 @@ extends StreamPlayer -func _ready(): - print (global.music) +func _ready(): if global.music: play(0) diff --git a/Scenes/Events/player.gd b/Scenes/Events/player.gd index 379eb69..0b8daf6 100644 --- a/Scenes/Events/player.gd +++ b/Scenes/Events/player.gd @@ -135,8 +135,9 @@ func show_damage (): func can_jump_more (): return jump_time > 0 -func play_sound(): - sound.play() +func play_sound(): + if global.sound: + sound.play() func _fixed_process(delta): if (jumping): diff --git a/Scenes/Events/player_spawner.gd b/Scenes/Events/player_spawner.gd index 0dc19f5..af47112 100644 --- a/Scenes/Events/player_spawner.gd +++ b/Scenes/Events/player_spawner.gd @@ -16,7 +16,8 @@ var rest = total_cages func _ready(): texts.set_text(str(init_text, total_cages, ".")) - sound.play() + if global.sound: + sound.play() anim.play("appear") player = PLAYER.instance() instancer.call_deferred("add_child", player) @@ -24,7 +25,8 @@ func _ready(): player.enable_player() func abduct(): - sound.play() + if global.sound: + sound.play() player.disable_player() anim.play("unvanish") global.save_cowbells() @@ -34,7 +36,8 @@ func liftoff(): get_tree().get_nodes_in_group("level_selector")[0].next_level() func deploy(): - sound.play() + if global.sound: + sound.play() anim.play("appear") yield(anim, "finished") player.enable_player() diff --git a/Scenes/Events/sound.gd b/Scenes/Events/sound.gd new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Scenes/Events/sound.gd @@ -0,0 +1 @@ + diff --git a/Scenes/Maps/map_0.tscn b/Scenes/Maps/map_0.tscn index 5107b0e..36967ff 100644 --- a/Scenes/Maps/map_0.tscn +++ b/Scenes/Maps/map_0.tscn @@ -1162,8 +1162,6 @@ script/script = ExtResource( 13 ) [node name="Cages" type="Node2D" parent="."] -editor/display_folded = true - [node name="jail" parent="Cages" instance=ExtResource( 14 )] transform/pos = Vector2( -1920, -2640 ) diff --git a/Scenes/Menu/settings.tscn b/Scenes/Menu/settings.tscn index 11b6f24..a03d450 100644 --- a/Scenes/Menu/settings.tscn +++ b/Scenes/Menu/settings.tscn @@ -54,10 +54,8 @@ script/source = "extends CheckButton func _ready(): set_pressed(global.sound) -func _on_CheckButton2_toggled( pressed ): - global.sound = !global.sound - -" +func _on_CheckButton3_toggled( pressed ): + global.sound = !global.sound" [node name="Control" type="Control"] From 75e3bb82a4e384371f53622dd73ab601df68a3cd Mon Sep 17 00:00:00 2001 From: dariasteam Date: Mon, 3 Sep 2018 09:14:27 +0100 Subject: [PATCH 3/7] Fix arrow selecting in settigns menu --- Scenes/Menu/level_selector.tscn | 1 + Scenes/Menu/settings.tscn | 194 +++++++++++++++++--------------- 2 files changed, 107 insertions(+), 88 deletions(-) diff --git a/Scenes/Menu/level_selector.tscn b/Scenes/Menu/level_selector.tscn index a926117..2e33052 100644 --- a/Scenes/Menu/level_selector.tscn +++ b/Scenes/Menu/level_selector.tscn @@ -70,6 +70,7 @@ margin/right = 897.0 margin/bottom = 422.0 scroll/horizontal = false scroll/vertical = true +scroll/deadzone = 0 [node name="VBoxContainer" type="VBoxContainer" parent="VButtonArray/ScrollContainer"] diff --git a/Scenes/Menu/settings.tscn b/Scenes/Menu/settings.tscn index a03d450..b15c844 100644 --- a/Scenes/Menu/settings.tscn +++ b/Scenes/Menu/settings.tscn @@ -75,9 +75,109 @@ focus/stop_mouse = true size_flags/horizontal = 2 size_flags/vertical = 2 margin/left = 38.0 -margin/top = 35.0 +margin/top = 34.0 margin/right = 1248.0 -margin/bottom = 693.0 +margin/bottom = 692.0 + +[node name="VBoxContainer" type="VBoxContainer" parent="Panel"] + +anchor/left = 3 +anchor/right = 3 +rect/scale = Vector2( 2, 2 ) +focus/ignore_mouse = false +focus/stop_mouse = false +size_flags/horizontal = 2 +size_flags/vertical = 2 +margin/left = 464.0 +margin/top = 109.0 +margin/right = -22.0 +margin/bottom = 291.0 +alignment = 0 +__meta__ = { +"_edit_group_": true +} + +[node name="CheckButton" type="CheckButton" parent="Panel/VBoxContainer" groups=[ +"set_onscreen_buttons", +]] + +rect/min_size = Vector2( 0, 30 ) +focus/ignore_mouse = false +focus/stop_mouse = true +size_flags/horizontal = 2 +size_flags/vertical = 2 +margin/left = 0.0 +margin/top = 0.0 +margin/right = 486.0 +margin/bottom = 30.0 +custom_fonts/font = ExtResource( 1 ) +toggle_mode = true +enabled_focus_mode = 2 +shortcut = null +text = "SWITCH_SCREEN_CONTROLS" +flat = false +align = 0 +script/script = SubResource( 1 ) + +[node name="CheckButton1" type="CheckButton" parent="Panel/VBoxContainer"] + +rect/min_size = Vector2( 0, 30 ) +focus/ignore_mouse = false +focus/stop_mouse = true +size_flags/horizontal = 2 +size_flags/vertical = 2 +margin/left = 0.0 +margin/top = 34.0 +margin/right = 486.0 +margin/bottom = 64.0 +custom_fonts/font = ExtResource( 1 ) +toggle_mode = true +enabled_focus_mode = 2 +shortcut = null +text = "SWITCH_RETRO_EFFECT" +flat = false +align = 0 +script/script = SubResource( 2 ) + +[node name="CheckButton2" type="CheckButton" parent="Panel/VBoxContainer"] + +rect/min_size = Vector2( 0, 30 ) +focus/ignore_mouse = false +focus/stop_mouse = true +size_flags/horizontal = 2 +size_flags/vertical = 2 +margin/left = 0.0 +margin/top = 68.0 +margin/right = 486.0 +margin/bottom = 98.0 +custom_fonts/font = ExtResource( 1 ) +toggle_mode = true +enabled_focus_mode = 2 +shortcut = null +text = "SWITCH_MUSIC" +flat = false +align = 0 +script/script = SubResource( 3 ) + +[node name="CheckButton3" type="CheckButton" parent="Panel/VBoxContainer"] + +rect/min_size = Vector2( 0, 30 ) +focus/ignore_mouse = false +focus/stop_mouse = true +size_flags/horizontal = 2 +size_flags/vertical = 2 +margin/left = 0.0 +margin/top = 102.0 +margin/right = 486.0 +margin/bottom = 132.0 +custom_fonts/font = ExtResource( 1 ) +toggle_mode = true +enabled_focus_mode = 2 +shortcut = null +text = "SWITCH_SOUND" +flat = false +align = 0 +script/script = SubResource( 4 ) [node name="VButtonArray" type="VButtonArray" parent="Panel"] @@ -94,88 +194,6 @@ button/count = 0 button/min_button_size = -1.0 button/align = 1065353216 -[node name="CheckButton" type="CheckButton" parent="Panel/VButtonArray" groups=[ -"set_onscreen_buttons", -]] - -rect/scale = Vector2( 2, 2 ) -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 96.0 -margin/top = -22.0 -margin/right = 502.0 -margin/bottom = 17.0 -custom_fonts/font = ExtResource( 1 ) -toggle_mode = true -enabled_focus_mode = 2 -shortcut = null -text = "SWITCH_SCREEN_CONTROLS" -flat = false -align = 0 -script/script = SubResource( 1 ) - -[node name="CheckButton1" type="CheckButton" parent="Panel/VButtonArray"] - -rect/scale = Vector2( 2, 2 ) -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 96.0 -margin/top = 54.0 -margin/right = 502.0 -margin/bottom = 93.0 -custom_fonts/font = ExtResource( 1 ) -toggle_mode = true -enabled_focus_mode = 2 -shortcut = null -text = "SWITCH_RETRO_EFFECT" -flat = false -align = 0 -script/script = SubResource( 2 ) - -[node name="CheckButton2" type="CheckButton" parent="Panel/VButtonArray"] - -rect/scale = Vector2( 2, 2 ) -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 96.0 -margin/top = 134.0 -margin/right = 502.0 -margin/bottom = 173.0 -custom_fonts/font = ExtResource( 1 ) -toggle_mode = true -enabled_focus_mode = 2 -shortcut = null -text = "SWITCH_MUSIC" -flat = false -align = 0 -script/script = SubResource( 3 ) - -[node name="CheckButton3" type="CheckButton" parent="Panel/VButtonArray"] - -rect/scale = Vector2( 2, 2 ) -focus/ignore_mouse = false -focus/stop_mouse = true -size_flags/horizontal = 2 -size_flags/vertical = 2 -margin/left = 95.0 -margin/top = 207.0 -margin/right = 501.0 -margin/bottom = 246.0 -custom_fonts/font = ExtResource( 1 ) -toggle_mode = true -enabled_focus_mode = 2 -shortcut = null -text = "SWITCH_SOUND" -flat = false -align = 0 -script/script = SubResource( 4 ) - [node name="Button" parent="Panel/VButtonArray" instance=ExtResource( 2 )] margin/left = 372.0 @@ -202,12 +220,12 @@ percent_visible = 1.0 lines_skipped = 0 max_lines_visible = -1 -[connection signal="toggled" from="Panel/VButtonArray/CheckButton" to="Panel/VButtonArray/CheckButton" method="_on_CheckButton_toggled"] +[connection signal="toggled" from="Panel/VBoxContainer/CheckButton" to="Panel/VBoxContainer/CheckButton" method="_on_CheckButton_toggled"] -[connection signal="toggled" from="Panel/VButtonArray/CheckButton1" to="Panel/VButtonArray/CheckButton1" method="_on_CheckButton1_toggled"] +[connection signal="toggled" from="Panel/VBoxContainer/CheckButton1" to="Panel/VBoxContainer/CheckButton1" method="_on_CheckButton1_toggled"] -[connection signal="toggled" from="Panel/VButtonArray/CheckButton2" to="Panel/VButtonArray/CheckButton2" method="_on_CheckButton2_toggled"] +[connection signal="toggled" from="Panel/VBoxContainer/CheckButton2" to="Panel/VBoxContainer/CheckButton2" method="_on_CheckButton2_toggled"] -[connection signal="toggled" from="Panel/VButtonArray/CheckButton3" to="Panel/VButtonArray/CheckButton3" method="_on_CheckButton3_toggled"] +[connection signal="toggled" from="Panel/VBoxContainer/CheckButton3" to="Panel/VBoxContainer/CheckButton3" method="_on_CheckButton3_toggled"] From 365dcdc0dc901785f66c89be0618bad2dcaa08a4 Mon Sep 17 00:00:00 2001 From: dariasteam Date: Mon, 3 Sep 2018 09:21:01 +0100 Subject: [PATCH 4/7] Add contributors to readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 0367da6..4535430 100644 --- a/README.md +++ b/README.md @@ -29,5 +29,9 @@ All resources have been created using the following FLOSS: - [inkscape](https://inkscape.org/en/) - [sfxr](http://www.drpetter.se/project_sfxr.html) +# Contributors and third party stuff + Shaders: [Enrique Lalves](https://github.com/henriquelalves/SimpleGodotCRTShader) Font: [Press Start 2P by CodeMan38 (Open Font License)](https://fonts.google.com/specimen/Press+Start+2P?selection.family=Press+Start+2P) + +- [Basxto](https://github.com/basxto) From 9309631766d9e1d2d8305c43cdd6020f1f47baba Mon Sep 17 00:00:00 2001 From: dariasteam Date: Mon, 3 Sep 2018 10:08:36 +0100 Subject: [PATCH 5/7] Add badges to readme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4535430..809d130 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -# Cow's Revenge ![]() [![Download](Misc/itch.io_badge.png)](https://pipoypipagames.itch.io/cows-revenge) +# Cow's Revenge +![]()[![Download](Misc/itch.io_badge.png)](https://pipoypipagames.itch.io/cows-revenge) +Download on Flathub > You are a cow abducted and genetically improved by aliens which now have the opportunity to rebel against livestock industry by freeing the encaged hens and killing butchers. You used to be a regular cow raised as a dairy cow, but you ain't that anymore. You have become better. You are... THE COWEST. From 2778aa45cc39b3c5e57470225fa9157df3e34c82 Mon Sep 17 00:00:00 2001 From: dariasteam Date: Mon, 3 Sep 2018 10:09:09 +0100 Subject: [PATCH 6/7] Add badges to readme --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 809d130..fd30cfe 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,13 @@ # Cow's Revenge ![]()[![Download](Misc/itch.io_badge.png)](https://pipoypipagames.itch.io/cows-revenge) + Download on Flathub + + + + > You are a cow abducted and genetically improved by aliens which now have the opportunity to rebel against livestock industry by freeing the encaged hens and killing butchers. You used to be a regular cow raised as a dairy cow, but you ain't that anymore. You have become better. You are... THE COWEST. From 969233d4a5f3d5a01d20f3b2063552255249ef07 Mon Sep 17 00:00:00 2001 From: dariasteam Date: Mon, 3 Sep 2018 10:28:49 +0100 Subject: [PATCH 7/7] Update changelog --- README.md | 2 -- f-droid/src/main/play/en/whatsnew | 6 +++++- f-droid/src/main/play/es/whatsnew | 7 +++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fd30cfe..96cf9ed 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ # Cow's Revenge ![]()[![Download](Misc/itch.io_badge.png)](https://pipoypipagames.itch.io/cows-revenge) - Download on Flathub - Get it on F-Droid diff --git a/f-droid/src/main/play/en/whatsnew b/f-droid/src/main/play/en/whatsnew index 2b5fd6a..0308c13 100644 --- a/f-droid/src/main/play/en/whatsnew +++ b/f-droid/src/main/play/en/whatsnew @@ -1 +1,5 @@ -First F-Droid Release +- Toggle music / sound in settings menu +- Gamepad improvements(thanks to contributor basxto): + - Add Going back in menues with B + - Additionally shooting with triggers + - Changing weapons with shoulder buttons diff --git a/f-droid/src/main/play/es/whatsnew b/f-droid/src/main/play/es/whatsnew index cd7679d..9b3c4e1 100644 --- a/f-droid/src/main/play/es/whatsnew +++ b/f-droid/src/main/play/es/whatsnew @@ -1,2 +1,5 @@ -Primera versión en F-Droid - +- Activa o desactiva la música y los sonidos en el menú principal +- Mejoras en el soporte de mando (contribución de Basxto) + - Botón B para vovler atrás en los menús + - DIsparo con los gatillos + - Cambio de arma con los bumpers