diff --git a/README.md b/README.md index 11e7bc0b..04df9321 100644 --- a/README.md +++ b/README.md @@ -17,4 +17,9 @@ Point-and-click adventure game developed using Escoria framework and Godot engin ## Export - Web: `godot -v --export "HTML5" ../gymkhana-export-html/index.html` - Linux: `godot -v --export "Linux/X11" ../LasGymkhanikasDeUli-1.0-RC1.appimage` -- ~~Windows: godot -v --export "Windows Desktop x64" ../LasGymkhanikasDeUli-1.0-RC1.exe~~ \ No newline at end of file +- ~~Windows: godot -v --export "Windows Desktop x64" ../LasGymkhanikasDeUli-1.0-RC1.exe~~ + + +## Sound attributions: +- button_clicking.ogg | Button Clicking 1 by Sheyvan -- https://freesound.org/s/475188/ -- License: Creative Commons 0 +- menu_button.ogg | Videogame Menu BUTTON CLICK by Christopherderp -- https://freesound.org/s/342200/ -- License: Creative Commons 0 \ No newline at end of file diff --git a/addons/escoria-ui-return-monkey-island/game.tscn b/addons/escoria-ui-return-monkey-island/game.tscn index f3d5c77d..54ef79c3 100644 --- a/addons/escoria-ui-return-monkey-island/game.tscn +++ b/addons/escoria-ui-return-monkey-island/game.tscn @@ -5,17 +5,17 @@ [ext_resource type="PackedScene" uid="uid://dmw5gicuenj53" path="res://addons/escoria-core/game/scenes/camera_player/camera.tscn" id="3"] [ext_resource type="PackedScene" uid="uid://d2kogebvoxy51" path="res://addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn" id="4"] [ext_resource type="Script" uid="uid://lkc4isk3g0rj" path="res://addons/escoria-ui-return-monkey-island/game.gd" id="5"] -[ext_resource type="Texture2D" uid="uid://c0rchilnmxyd" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note.svg" id="6"] +[ext_resource type="Texture2D" uid="uid://ce2rx8nm1s6gh" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note.svg" id="6"] [ext_resource type="PackedScene" uid="uid://d3wdxi18u52c5" path="res://addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn" id="7"] [ext_resource type="PackedScene" uid="uid://dl7w8oqk1rmhw" path="res://addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn" id="8"] [ext_resource type="Theme" uid="uid://bf2eet52fueam" path="res://addons/escoria-ui-return-monkey-island/theme/ui.tres" id="9"] -[ext_resource type="Texture2D" uid="uid://ch7vmpx5l23fy" path="res://addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg" id="10"] -[ext_resource type="Texture2D" uid="uid://btng6bg3t644v" path="res://addons/escoria-ui-return-monkey-island/icons/cog-64.svg" id="11"] +[ext_resource type="Texture2D" uid="uid://doahvd61d05u8" path="res://addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg" id="10"] +[ext_resource type="Texture2D" uid="uid://cvxd4tjmdwj5l" path="res://addons/escoria-ui-return-monkey-island/icons/cog-64.svg" id="11"] [ext_resource type="PackedScene" uid="uid://ctg3fukoficqk" path="res://addons/escoria-ui-return-monkey-island/video_player/video_player.tscn" id="12"] -[ext_resource type="Texture2D" uid="uid://dwkquq28fkf8n" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg" id="13"] +[ext_resource type="Texture2D" uid="uid://dghklsdy5nmcg" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg" id="13"] [ext_resource type="Script" uid="uid://chas0xyx88njl" path="res://addons/escoria-ui-return-monkey-island/MusicButton.gd" id="14"] -[ext_resource type="Texture2D" uid="uid://p214fv1y4fr4" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg" id="15"] -[ext_resource type="Texture2D" uid="uid://bcurldbc1pvn2" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg" id="16"] +[ext_resource type="Texture2D" uid="uid://d2sehci16hioi" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg" id="15"] +[ext_resource type="Texture2D" uid="uid://e2xk0aimdte" path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg" id="16"] [node name="game" type="Node2D"] script = ExtResource("5") @@ -91,10 +91,16 @@ texture_normal = ExtResource("11") texture_hover = ExtResource("10") [node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/ui"] -layout_mode = 0 +layout_mode = 1 +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -offset_top = 18.0 +offset_left = -2.0 +offset_top = -8.0 +offset_right = -2.0 +offset_bottom = -16.0 +grow_horizontal = 2 +grow_vertical = 2 size_flags_horizontal = 3 size_flags_vertical = 3 diff --git a/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn b/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn index 0c7cb176..76f25f32 100644 --- a/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn +++ b/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn @@ -19,6 +19,7 @@ inventory_ui_container = NodePath("FloatingInventory/panel/MarginContainer/Scrol [node name="FloatingInventory" type="CanvasLayer" parent="."] [node name="inventory_bg" type="Polygon2D" parent="FloatingInventory"] +position = Vector2(0, -16) color = Color(0.156863, 0.0627451, 0, 1) polygon = PackedVector2Array(-3, 578, 1280, 578, 1280, 752, -3, 757) diff --git a/addons/escoria-ui-return-monkey-island/menus/RTMIMenuButton.gd b/addons/escoria-ui-return-monkey-island/menus/RTMIMenuButton.gd new file mode 100644 index 00000000..3ff21ed3 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/menus/RTMIMenuButton.gd @@ -0,0 +1,16 @@ +extends Button +class_name RTMIMenuButton + +@onready var hover_sound = AudioStreamPlayer.new() +@onready var click_sound = AudioStreamPlayer.new() + +func _ready() -> void: + hover_sound.stream = load("res://addons/escoria-ui-return-monkey-island/sounds/menu_button.ogg") + click_sound.stream = load("res://addons/escoria-ui-return-monkey-island/sounds/menu_button.ogg") + hover_sound.volume_db = -20 + click_sound.volume_db = -20 + click_sound.pitch_scale = 1.5 + pressed.connect(func(): click_sound.play()) + mouse_entered.connect(func(): hover_sound.play()) + add_child(hover_sound) + add_child(click_sound) diff --git a/addons/escoria-ui-return-monkey-island/menus/RTMIMenuButton.gd.uid b/addons/escoria-ui-return-monkey-island/menus/RTMIMenuButton.gd.uid new file mode 100644 index 00000000..f5bef933 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/menus/RTMIMenuButton.gd.uid @@ -0,0 +1 @@ +uid://igjijrs4qngp diff --git a/addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd b/addons/escoria-ui-return-monkey-island/menus/RTMIMenuButtonWithSaveFeature.gd similarity index 75% rename from addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd rename to addons/escoria-ui-return-monkey-island/menus/RTMIMenuButtonWithSaveFeature.gd index a5a84bc6..c6996319 100644 --- a/addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd +++ b/addons/escoria-ui-return-monkey-island/menus/RTMIMenuButtonWithSaveFeature.gd @@ -1,8 +1,8 @@ -extends Button +extends RTMIMenuButton +class_name RTMIMenuButtonWithSaveFeature var save_enabled = ESCProjectSettingsManager.get_setting( RTMIUiSettings.SAVEGAME_ENABLED) func _process(_delta): self.visible = ProjectSettings.get_setting( RTMIUiSettings.SAVEGAME_ENABLED) - diff --git a/addons/escoria-ui-return-monkey-island/menus/RTMIMenuButtonWithSaveFeature.gd.uid b/addons/escoria-ui-return-monkey-island/menus/RTMIMenuButtonWithSaveFeature.gd.uid new file mode 100644 index 00000000..62b4ef31 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/menus/RTMIMenuButtonWithSaveFeature.gd.uid @@ -0,0 +1 @@ +uid://bfi05b2x5srm2 diff --git a/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn b/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn index 7d1e76af..9708f6f2 100644 --- a/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn +++ b/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn @@ -1,35 +1,39 @@ -[gd_scene load_steps=6 format=3 uid="uid://d3wdxi18u52c5"] +[gd_scene load_steps=7 format=3 uid="uid://d3wdxi18u52c5"] [ext_resource type="Script" uid="uid://cnlvmkxk41x6j" path="res://addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd" id="1"] -[ext_resource type="Script" uid="uid://c7y2f4rocpq4h" path="res://addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd" id="2"] -[ext_resource type="Texture2D" uid="uid://budal8dqwrifr" path="res://gymkhana/logo-small.png" id="3"] -[ext_resource type="PackedScene" path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" id="4"] +[ext_resource type="Script" uid="uid://c7y2f4rocpq4h" path="res://addons/escoria-ui-return-monkey-island/menus/RTMIMenuButtonWithSaveFeature.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://bgfi7t6khinjw" path="res://gymkhana/logo-small.png" id="3"] +[ext_resource type="PackedScene" uid="uid://csxvnrljbqkr8" path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" id="4"] [ext_resource type="PackedScene" uid="uid://j3wkbyhedkpr" path="res://addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn" id="5"] +[ext_resource type="Script" uid="uid://igjijrs4qngp" path="res://addons/escoria-ui-return-monkey-island/menus/RTMIMenuButton.gd" id="5_4i6cp"] [node name="main_menu" type="Control"] +layout_mode = 3 +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource("1") [node name="load_game" parent="." instance=ExtResource("5")] visible = false +layout_mode = 1 [node name="options" parent="." instance=ExtResource("4")] visible = false +anchors_preset = 0 [node name="main" type="Control" parent="."] +anchors_preset = 0 anchor_right = 1.0 anchor_bottom = 1.0 [node name="Panel" type="Panel" parent="main"] +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 -__meta__ = { -"_edit_use_anchors_": false, -"_editor_description_": "" -} [node name="main" type="VBoxContainer" parent="main"] +layout_mode = 0 anchor_left = 0.5 anchor_right = 0.5 anchor_bottom = 1.0 @@ -37,65 +41,40 @@ offset_left = -308.0 offset_right = 308.0 theme_override_constants/separation = 100 alignment = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="TextureRect" type="TextureRect" parent="main/main"] -offset_top = 55.0 -offset_right = 616.0 -offset_bottom = 355.0 +layout_mode = 2 texture = ExtResource("3") -__meta__ = { -"_edit_use_anchors_": false -} [node name="buttons" type="VBoxContainer" parent="main/main"] -offset_top = 455.0 -offset_right = 616.0 -offset_bottom = 695.0 +layout_mode = 2 theme_override_constants/separation = 10 -__meta__ = { -"_edit_use_anchors_": false -} [node name="new_game" type="Button" parent="main/main/buttons"] -offset_right = 616.0 -offset_bottom = 150.0 custom_minimum_size = Vector2(0, 150) +layout_mode = 2 size_flags_vertical = 3 text = "NEW_GAME" -__meta__ = { -"_edit_use_anchors_": false -} +script = ExtResource("5_4i6cp") [node name="load_game" type="Button" parent="main/main/buttons"] -offset_top = 160.0 -offset_right = 616.0 -offset_bottom = 180.0 +layout_mode = 2 text = "LOAD_GAME" script = ExtResource("2") -__meta__ = { -"_edit_use_anchors_": false -} [node name="options" type="Button" parent="main/main/buttons"] -offset_top = 190.0 -offset_right = 616.0 -offset_bottom = 210.0 +layout_mode = 2 text = "OPTIONS" +script = ExtResource("5_4i6cp") [node name="quit" type="Button" parent="main/main/buttons"] -offset_top = 220.0 -offset_right = 616.0 -offset_bottom = 240.0 +layout_mode = 2 text = "QUIT" -__meta__ = { -"_edit_use_anchors_": false -} +script = ExtResource("5_4i6cp") [connection signal="back_button_pressed" from="load_game" to="." method="_on_load_game_back_button_pressed"] [connection signal="back_button_pressed" from="options" to="." method="_on_options_back_button_pressed"] +[connection signal="mouse_entered" from="main/main/buttons/new_game" to="main/main/buttons/new_game" method="_on_mouse_entered"] [connection signal="pressed" from="main/main/buttons/new_game" to="." method="_on_new_game_pressed"] [connection signal="pressed" from="main/main/buttons/load_game" to="." method="_on_load_game_pressed"] [connection signal="pressed" from="main/main/buttons/options" to="." method="_on_options_pressed"] diff --git a/addons/escoria-ui-return-monkey-island/menus/menu_button.gd.uid b/addons/escoria-ui-return-monkey-island/menus/menu_button.gd.uid new file mode 100644 index 00000000..38b5d561 --- /dev/null +++ b/addons/escoria-ui-return-monkey-island/menus/menu_button.gd.uid @@ -0,0 +1 @@ +uid://7r52k008dvrx diff --git a/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn b/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn index afe4b6be..b6fdf679 100644 --- a/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn +++ b/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn @@ -1,117 +1,96 @@ -[gd_scene load_steps=7 format=3 uid="uid://dl7w8oqk1rmhw"] +[gd_scene load_steps=8 format=3 uid="uid://dl7w8oqk1rmhw"] [ext_resource type="Script" uid="uid://ctu22fcrvjv4t" path="res://addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd" id="1"] [ext_resource type="PackedScene" uid="uid://csxvnrljbqkr8" path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" id="2"] -[ext_resource type="Texture2D" uid="uid://budal8dqwrifr" path="res://gymkhana/logo-small.png" id="3"] +[ext_resource type="Texture2D" uid="uid://bgfi7t6khinjw" path="res://gymkhana/logo-small.png" id="3"] [ext_resource type="PackedScene" uid="uid://cj440t8pub603" path="res://addons/escoria-core/ui_library/menus/load_save/save/save_game.tscn" id="4"] [ext_resource type="PackedScene" uid="uid://j3wkbyhedkpr" path="res://addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn" id="5"] -[ext_resource type="Script" uid="uid://c7y2f4rocpq4h" path="res://addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd" id="6"] +[ext_resource type="Script" uid="uid://igjijrs4qngp" path="res://addons/escoria-ui-return-monkey-island/menus/RTMIMenuButton.gd" id="6_31lra"] +[ext_resource type="Script" uid="uid://bfi05b2x5srm2" path="res://addons/escoria-ui-return-monkey-island/menus/RTMIMenuButtonWithSaveFeature.gd" id="7_e0gqa"] [node name="pause_menu" type="Control"] +layout_mode = 3 +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource("1") [node name="Panel" type="Panel" parent="."] +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 -__meta__ = { -"_edit_use_anchors_": false -} [node name="save_game" parent="." instance=ExtResource("4")] visible = false +layout_mode = 1 [node name="load_game" parent="." instance=ExtResource("5")] visible = false +layout_mode = 1 [node name="options" parent="." instance=ExtResource("2")] visible = false +anchors_preset = 0 [node name="VBoxContainer" type="VBoxContainer" parent="."] +layout_mode = 1 +anchors_preset = 13 anchor_left = 0.5 anchor_right = 0.5 anchor_bottom = 1.0 offset_left = -308.0 +offset_top = 9.0 offset_right = 308.0 +offset_bottom = 44.0 +grow_horizontal = 2 +grow_vertical = 2 +scale = Vector2(0.92, 0.92) theme_override_constants/separation = 100 alignment = 1 [node name="TextureRect" type="TextureRect" parent="VBoxContainer"] -offset_top = 25.0 -offset_right = 616.0 -offset_bottom = 325.0 +layout_mode = 2 texture = ExtResource("3") -__meta__ = { -"_edit_use_anchors_": false -} [node name="menuitems" type="VBoxContainer" parent="VBoxContainer"] -offset_top = 425.0 -offset_right = 616.0 -offset_bottom = 725.0 +layout_mode = 2 theme_override_constants/separation = 10 -__meta__ = { -"_edit_use_anchors_": false -} [node name="continue" type="Button" parent="VBoxContainer/menuitems"] -offset_right = 616.0 -offset_bottom = 150.0 custom_minimum_size = Vector2(0, 150) +layout_mode = 2 size_flags_vertical = 3 text = "CONTINUE_GAME" -__meta__ = { -"_edit_use_anchors_": false -} +script = ExtResource("6_31lra") [node name="new_game" type="Button" parent="VBoxContainer/menuitems"] -offset_top = 160.0 -offset_right = 616.0 -offset_bottom = 180.0 +layout_mode = 2 size_flags_vertical = 3 text = "NEW_GAME" -__meta__ = { -"_edit_use_anchors_": false -} +script = ExtResource("6_31lra") [node name="save_game" type="Button" parent="VBoxContainer/menuitems"] -offset_top = 190.0 -offset_right = 616.0 -offset_bottom = 210.0 +layout_mode = 2 size_flags_vertical = 3 text = "SAVE_GAME" -script = ExtResource("6") -__meta__ = { -"_edit_use_anchors_": false -} +script = ExtResource("7_e0gqa") [node name="load_game" type="Button" parent="VBoxContainer/menuitems"] -offset_top = 220.0 -offset_right = 616.0 -offset_bottom = 240.0 +layout_mode = 2 size_flags_vertical = 3 text = "LOAD_GAME" -script = ExtResource("6") -__meta__ = { -"_edit_use_anchors_": false -} +script = ExtResource("7_e0gqa") [node name="options" type="Button" parent="VBoxContainer/menuitems"] -offset_top = 250.0 -offset_right = 616.0 -offset_bottom = 270.0 +layout_mode = 2 text = "OPTIONS" +script = ExtResource("6_31lra") [node name="quit" type="Button" parent="VBoxContainer/menuitems"] -offset_top = 280.0 -offset_right = 616.0 -offset_bottom = 300.0 +layout_mode = 2 size_flags_vertical = 3 text = "QUIT" -__meta__ = { -"_edit_use_anchors_": false -} +script = ExtResource("6_31lra") [connection signal="back_button_pressed" from="save_game" to="." method="_on_save_game_back_button_pressed"] [connection signal="back_button_pressed" from="load_game" to="." method="_on_load_game_back_button_pressed"] diff --git a/addons/escoria-ui-return-monkey-island/sounds/menu_button.ogg b/addons/escoria-ui-return-monkey-island/sounds/menu_button.ogg new file mode 100644 index 00000000..9c48f138 Binary files /dev/null and b/addons/escoria-ui-return-monkey-island/sounds/menu_button.ogg differ diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc b/gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc index 6144ddbe..90f8f563 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc @@ -24,5 +24,7 @@ :action3 "turno_cocina_frontal" global turno_cocina_frontal_debajo_sofa + play_lib_snd("button_clicking") + wait(1) say($player, "Veo una patata!!", "cocina_debajo_sofa_action3_frontal_say") turno_cocina_frontal_debajo_sofa = true diff --git a/gymkhana/sounds/button_clicking.ogg b/gymkhana/sounds/button_clicking.ogg new file mode 100644 index 00000000..92233033 Binary files /dev/null and b/gymkhana/sounds/button_clicking.ogg differ