diff --git a/Locales/.~lock.locales.csv# b/Locales/.~lock.locales.csv# new file mode 100644 index 0000000..ad4b620 --- /dev/null +++ b/Locales/.~lock.locales.csv# @@ -0,0 +1 @@ +,darias,darias-laptop,19.10.2018 06:24,file:///home/darias/.config/libreoffice/4; \ No newline at end of file diff --git a/Locales/locales.csv b/Locales/locales.csv index 554bc12..833a077 100644 --- a/Locales/locales.csv +++ b/Locales/locales.csv @@ -6,6 +6,7 @@ SWITCH_SCREEN_CONTROLS,Usar botones táctiles,Use onscreen controls,Touch-Steuer SWITCH_RETRO_EFFECT,Simular pantalla retro,Simulate retro TV,Röhrenfernseher simulieren, SWITCH_MUSIC,Música,Music,Musik, SWITCH_SOUND,Sonidos,Sound,Ton, +SWITCH_BOTTOM_PARTICLES,Resaltar final del nivel,Show level end,, BTTN_BACK,Volver,Back,Zurück, 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 nosotros y están licenciados como Creative Commons Attribution-Non Commercial-Share Alike 4.0. La tipografía utilizada es Press Start 2P creada por CodeMan38 (Open Font License) diff --git a/Locales/locales.de.xl b/Locales/locales.de.xl index e21e3aa..674ecdf 100644 Binary files a/Locales/locales.de.xl and b/Locales/locales.de.xl differ diff --git a/Locales/locales.en.xl b/Locales/locales.en.xl index e67a642..d2411dd 100644 Binary files a/Locales/locales.en.xl and b/Locales/locales.en.xl differ diff --git a/Locales/locales.es.xl b/Locales/locales.es.xl index e66d89e..a4cb38a 100644 Binary files a/Locales/locales.es.xl and b/Locales/locales.es.xl differ diff --git a/Scenes/Events/death_line.gd b/Scenes/Events/death_line.gd index 947ea6c..df41510 100644 --- a/Scenes/Events/death_line.gd +++ b/Scenes/Events/death_line.gd @@ -9,9 +9,9 @@ func _on_DeathLine_body_enter( body ): func _on_death_line_area_enter( area ): - if(area.is_in_group("bottom_level_detector")): + if(area.is_in_group("bottom_level_detector") and global.bottom_particles): particles.set_emitting(true) func _on_death_line_area_exit( area ): - if(area.is_in_group("bottom_level_detector")): + if(area.is_in_group("bottom_level_detector") and global.bottom_particles): particles.set_emitting(false) diff --git a/Scenes/Menu/global.gd b/Scenes/Menu/global.gd index de64cd4..ada92f1 100644 --- a/Scenes/Menu/global.gd +++ b/Scenes/Menu/global.gd @@ -15,6 +15,7 @@ var can_show_in_game_menu = true var retro_effect = true var music = true var sound = true +var bottom_particles = false var level = 0 var unlocked_levels = 1 @@ -81,7 +82,8 @@ func save_game(): retro_effect=retro_effect, # NEW STUFF sound=sound, - music=music + music=music, + bottom_particles=bottom_particles } save_game.store_line(data.to_json()) save_game.close() @@ -100,7 +102,7 @@ func load_game(): onscreen_controls = current_line["onscreen_controls"] cowbells = current_line["saved_cowbells"] saved_cowbells = cowbells - + max_milk = current_line["max_milk"] max_life = current_line["max_life"] life = current_line["life"] @@ -112,4 +114,7 @@ func load_game(): if (current_line.has("sound")): sound = current_line["sound"] music = current_line["music"] + + if (current_line.has("bottom_particles")): + bottom_particles = current_line["bottom_particles"] \ No newline at end of file diff --git a/Scenes/Menu/settings.tscn b/Scenes/Menu/settings.tscn index b15c844..f19de1e 100644 --- a/Scenes/Menu/settings.tscn +++ b/Scenes/Menu/settings.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=1] +[gd_scene load_steps=10 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] @@ -57,6 +57,18 @@ func _ready(): func _on_CheckButton3_toggled( pressed ): global.sound = !global.sound" +[sub_resource type="GDScript" id=5] + +script/source = "extends CheckButton + +func _ready(): + set_pressed(global.bottom_particles) + +func _on_CheckButton4_toggled( pressed ): + global.bottom_particles = !global.bottom_particles + +" + [node name="Control" type="Control"] focus/ignore_mouse = false @@ -179,6 +191,26 @@ flat = false align = 0 script/script = SubResource( 4 ) +[node name="CheckButton4" 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 = 136.0 +margin/right = 486.0 +margin/bottom = 166.0 +custom_fonts/font = ExtResource( 1 ) +toggle_mode = true +enabled_focus_mode = 2 +shortcut = null +text = "SWITCH_BOTTOM_PARTICLES" +flat = false +align = 0 +script/script = SubResource( 5 ) + [node name="VButtonArray" type="VButtonArray" parent="Panel"] focus/ignore_mouse = false @@ -228,4 +260,6 @@ max_lines_visible = -1 [connection signal="toggled" from="Panel/VBoxContainer/CheckButton3" to="Panel/VBoxContainer/CheckButton3" method="_on_CheckButton3_toggled"] +[connection signal="toggled" from="Panel/VBoxContainer/CheckButton4" to="Panel/VBoxContainer/CheckButton4" method="_on_CheckButton4_toggled"] +