Implement save and loading games (#8)

game/ui/commons/load/load_game.gd

@@ -0,0 +1,26 @@
+extends Control
+
+signal back_button_pressed
+
+export(PackedScene) var slot_ui_scene
+
+func _ready():
+	refresh_savegames()
+
+func _on_slot_pressed(slot_id: int) -> void:
+	escoria.save_manager.load_game(slot_id)
+
+func _on_back_pressed():
+	emit_signal("back_button_pressed")
+
+func refresh_savegames():
+	for slot in $ScrollContainer/slots.get_children():
+		$ScrollContainer/slots.remove_child(slot)
+	
+	var saves_list = escoria.save_manager.get_saves_list()
+	for i in saves_list.size():
+		var save_data = saves_list[i+1]
+		var new_slot = slot_ui_scene.instance()
+		$ScrollContainer/slots.add_child(new_slot)
+		new_slot.set_slot_name_date(save_data["name"], save_data["date"])
+		new_slot.connect("pressed", self, "_on_slot_pressed", [i+1])

game/ui/commons/load/load_game.tscn

@@ -0,0 +1,50 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=1]
+[ext_resource path="res://game/ui/commons/load_save_slot/load_save_slot.tscn" type="PackedScene" id=2]
+[ext_resource path="res://game/ui/commons/load/load_game.gd" type="Script" id=3]
+
+[node name="load_game" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+script = ExtResource( 3 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+slot_ui_scene = ExtResource( 2 )
+
+[node name="back" type="Button" parent="."]
+margin_left = 130.0
+margin_top = 329.0
+margin_right = 304.0
+margin_bottom = 383.0
+custom_fonts/font = ExtResource( 1 )
+text = "OPTIONS_BACK"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="ScrollContainer" type="ScrollContainer" parent="."]
+anchor_left = 0.291
+anchor_top = 0.369
+anchor_right = 0.709
+anchor_bottom = 0.941
+margin_left = -0.480011
+margin_top = -1.10001
+margin_right = 0.479919
+margin_bottom = -0.900024
+scroll_horizontal_enabled = false
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="slots" type="VBoxContainer" parent="ScrollContainer"]
+margin_right = 536.0
+margin_bottom = 515.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[connection signal="pressed" from="back" to="." method="_on_back_pressed"]

game/ui/commons/load_save_slot/load_save_slot.gd

@@ -0,0 +1,7 @@
+extends Button
+
+
+func set_slot_name_date(p_name: String, p_date: String):
+	$VBoxContainer/slot_name.text = p_name
+	$VBoxContainer/date.text = p_date
+

game/ui/commons/load_save_slot/load_save_slot.tscn

@@ -0,0 +1,38 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=1]
+[ext_resource path="res://game/ui/commons/load_save_slot/load_save_slot.gd" type="Script" id=2]
+
+[node name="slot" type="Button"]
+margin_right = 665.0
+margin_bottom = 86.0
+rect_min_size = Vector2( 0, 100 )
+size_flags_horizontal = 3
+script = ExtResource( 2 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+alignment = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="slot_name" type="Label" parent="VBoxContainer"]
+margin_top = 27.0
+margin_right = 665.0
+margin_bottom = 48.0
+custom_fonts/font = ExtResource( 1 )
+text = "slot_name"
+align = 1
+
+[node name="date" type="Label" parent="VBoxContainer"]
+margin_top = 52.0
+margin_right = 665.0
+margin_bottom = 73.0
+custom_fonts/font = ExtResource( 1 )
+text = "date"
+align = 1

game/ui/commons/main_menu/main_menu.gd

@@ -25,24 +25,25 @@ func _on_continue_pressed():
 	pass
 
 
-
-
-
-func switch_language(lang : String):
+func switch_language(lang: String):
 	TranslationServer.set_locale(lang)
 
 
 func _on_new_game_pressed():
 	escoria.new_game()
 
+
 func _on_load_game_pressed():
-	#  Show Loading screen
-	pass
+	$Panel/main.hide()
+	$Panel/load_game.refresh_savegames()
+	$Panel/load_game.show()
+
 
 func _on_options_pressed():
 	$Panel/main.hide()
 	$Panel/options.show()
 
+
 func _on_quit_pressed():
 	get_tree().quit()
 
@@ -50,8 +51,12 @@ func _on_quit_pressed():
 ###########################################################################
 # OPTIONS
 
-
-func _on_back_pressed():
+func _on_options_back_button_pressed():
 	$Panel/options.hide()
 	$Panel/main.show()
+
+
+func _on_load_game_back_button_pressed():
+	$Panel/load_game.hide()
+	$Panel/main.show()
 	

game/ui/commons/main_menu/main_menu.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://game/ui/commons/main_menu/main_menu.gd" type="Script" id=1]
 [ext_resource path="res://game/ui/commons/main_menu/main.tscn" type="PackedScene" id=2]
 [ext_resource path="res://addons/escoria-core/logo/escoria-logo-small.png" type="Texture" id=3]
-[ext_resource path="res://game/ui/commons/main_menu/options.tscn" type="PackedScene" id=4]
+[ext_resource path="res://game/ui/commons/options/options.tscn" type="PackedScene" id=4]
+[ext_resource path="res://game/ui/commons/load/load_game.tscn" type="PackedScene" id=5]
 
 [node name="main_menu" type="Control"]
 anchor_right = 1.0
@@ -38,11 +39,14 @@ __meta__ = {
 [node name="options" parent="Panel" instance=ExtResource( 4 )]
 visible = false
 
+[node name="load_game" parent="Panel" instance=ExtResource( 5 )]
+visible = false
+
 [connection signal="pressed" from="Panel/main/new_game" to="." method="_on_new_game_pressed"]
 [connection signal="pressed" from="Panel/main/load_game" to="." method="_on_load_game_pressed"]
 [connection signal="pressed" from="Panel/main/options" to="." method="_on_options_pressed"]
 [connection signal="pressed" from="Panel/main/quit" to="." method="_on_quit_pressed"]
-[connection signal="pressed" from="Panel/options/back" to="." method="_on_back_pressed"]
+[connection signal="back_button_pressed" from="Panel/options" to="." method="_on_options_back_button_pressed"]
+[connection signal="back_button_pressed" from="Panel/load_game" to="." method="_on_load_game_back_button_pressed"]
 
 [editable path="Panel/main"]
-[editable path="Panel/options"]

game/ui/commons/options/options.gd

@@ -1,35 +1,63 @@
 extends Control
 
+signal back_button_pressed
+
+onready var settings_changed = false
+onready var backup_settings
+
+
 func _ready():
 	initialize_options(escoria.settings)
 
+
+func show():
+	backup_settings = escoria.settings.duplicate()
+	initialize_options(backup_settings)
+	visible = true
+
+
 func initialize_options(p_settings):
 	$options/general_volume.value = p_settings["master_volume"]
 	$options/sound_volume.value = p_settings["sfx_volume"]
 	$options/music_volume.value = p_settings["music_volume"]
 
-func greyout_other_languages(except_lang : String) -> void:
+
+func greyout_other_languages(except_lang: String) -> void:
 	pass
 
-func _on_language_input(event : InputEvent, language : String):
+
+func _on_language_input(event: InputEvent, language: String):
 	if event.is_pressed():
 		TranslationServer.set_locale(language)
 		escoria.settings["text_lang"] = language
-		escoria.save_data.save_settings(escoria.settings, null)
+		settings_changed = true
 
 
 func _on_sound_volume_changed(value):
 	escoria.settings["sfx_volume"] = value
-	escoria.save_data.save_settings(escoria.settings, null)
 	escoria._on_settings_loaded(escoria.settings)
+	settings_changed = true
+
 
 func _on_music_volume_changed(value):
 	escoria.settings["music_volume"] = value
-	escoria.save_data.save_settings(escoria.settings, null)
 	escoria._on_settings_loaded(escoria.settings)
-
+	settings_changed = true
+	
 
 func _on_general_volume_changed(value):
 	escoria.settings["master_volume"] = value
-	escoria.save_data.save_settings(escoria.settings, null)
 	escoria._on_settings_loaded(escoria.settings)
+	settings_changed = true
+	
+
+func _on_apply_pressed():
+	escoria.save_manager.save_settings()
+	settings_changed = false
+	emit_signal("back_button_pressed")
+
+
+func _on_back_pressed():
+	escoria.settings = backup_settings
+	escoria._on_settings_loaded(escoria.settings)
+	emit_signal("back_button_pressed")

game/ui/commons/options/options.tscn

@@ -3,7 +3,7 @@
 [ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=1]
 [ext_resource path="res://game/ui/commons/main_menu/flags/en_EN_small.png" type="Texture" id=2]
 [ext_resource path="res://game/ui/commons/main_menu/flags/fr_FR_small.png" type="Texture" id=3]
-[ext_resource path="res://game/ui/commons/main_menu/options.gd" type="Script" id=4]
+[ext_resource path="res://game/ui/commons/options/options.gd" type="Script" id=4]
 
 [node name="options" type="Control"]
 anchor_right = 1.0
@@ -125,8 +125,21 @@ max_value = 1.0
 step = 0.001
 value = 0.001
 
+[node name="apply" type="Button" parent="."]
+margin_left = 364.0
+margin_top = 712.0
+margin_right = 544.0
+margin_bottom = 767.0
+custom_fonts/font = ExtResource( 1 )
+text = "APPLY"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[connection signal="pressed" from="back" to="." method="_on_back_pressed"]
 [connection signal="gui_input" from="options/flags/fr" to="." method="_on_language_input" binds= [ "fr" ]]
 [connection signal="gui_input" from="options/flags/en" to="." method="_on_language_input" binds= [ "en" ]]
 [connection signal="value_changed" from="options/general_volume" to="." method="_on_general_volume_changed"]
 [connection signal="value_changed" from="options/sound_volume" to="." method="_on_sound_volume_changed"]
 [connection signal="value_changed" from="options/music_volume" to="." method="_on_music_volume_changed"]
+[connection signal="pressed" from="apply" to="." method="_on_apply_pressed"]

game/ui/commons/pause_menu/pause_menu.gd

@@ -6,12 +6,25 @@ func _on_continue_pressed():
 
 
 func _on_save_game_pressed():
-	pass
+	$Panel/VBoxContainer.hide()
+	$save_game.show()
 
 
 func _on_load_game_pressed():
-	pass
+	$Panel/VBoxContainer.hide()
+	$load_game.refresh_savegames()
+	$load_game.show()
 
 
 func _on_quit_pressed():
 	get_tree().quit()
+
+
+func _on_save_game_back_button_pressed():
+	$Panel/VBoxContainer.show()
+	$save_game.hide()
+
+
+func _on_load_game_back_button_pressed():
+	$Panel/VBoxContainer.show()
+	$load_game.hide()

game/ui/commons/pause_menu/pause_menu.tscn

@@ -1,8 +1,10 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://game/ui/commons/pause_menu/pause_menu.gd" type="Script" id=1]
 [ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=2]
 [ext_resource path="res://addons/escoria-core/logo/escoria-logo-small.png" type="Texture" id=3]
+[ext_resource path="res://game/ui/commons/save/save_game.tscn" type="PackedScene" id=4]
+[ext_resource path="res://game/ui/commons/load/load_game.tscn" type="PackedScene" id=5]
 
 [node name="pause_menu" type="Control"]
 anchor_right = 1.0
@@ -87,7 +89,15 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="save_game" parent="." instance=ExtResource( 4 )]
+visible = false
+
+[node name="load_game" parent="." instance=ExtResource( 5 )]
+visible = false
+
 [connection signal="pressed" from="Panel/VBoxContainer/continue" to="." method="_on_continue_pressed"]
 [connection signal="pressed" from="Panel/VBoxContainer/save_game" to="." method="_on_save_game_pressed"]
 [connection signal="pressed" from="Panel/VBoxContainer/load_game" to="." method="_on_load_game_pressed"]
 [connection signal="pressed" from="Panel/VBoxContainer/quit" to="." method="_on_quit_pressed"]
+[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"]

game/ui/commons/save/save_game.gd

@@ -0,0 +1,59 @@
+extends Control
+
+signal back_button_pressed
+
+export(PackedScene) var slot_ui_scene
+
+var slot_pressed
+
+func _ready():
+	refresh_savegames()
+
+
+func _on_slot_pressed(p_slot_n: int):
+	slot_pressed = p_slot_n
+	if escoria.save_manager.save_game_exists(p_slot_n):
+		# TODO Manage save override, ask for confirmation
+		pass
+	else:
+		$save_name_popup.popup()
+
+
+func refresh_savegames():
+	for slot in $ScrollContainer/slots.get_children():
+		$ScrollContainer/slots.remove_child(slot)
+	
+	var saves_list = escoria.save_manager.get_saves_list()
+	for i in saves_list.size():
+		var save_data = saves_list[i+1]
+		var new_slot = slot_ui_scene.instance()
+		$ScrollContainer/slots.add_child(new_slot)
+		new_slot.set_slot_name_date(save_data["name"], save_data["date"])
+		new_slot.connect("pressed", self, "_on_slot_pressed", [i+1])
+	
+	var datetime = OS.get_datetime()
+	var datetime_string = "%02d/%02d/%02d %02d:%02d" % [
+		datetime["day"],
+		datetime["month"],
+		datetime["year"],
+		datetime["hour"],
+		datetime["minute"],
+	]
+	var new_slot = slot_ui_scene.instance()
+	$ScrollContainer/slots.add_child(new_slot)
+	new_slot.set_slot_name_date(tr("New save"), datetime_string)
+	new_slot.connect("pressed", self, "_on_slot_pressed", [saves_list.size()+1])
+		
+
+func _on_back_pressed():
+	emit_signal("back_button_pressed")
+
+
+func _on_save_name_popup_savegame_name_ok(p_savename: String):
+	escoria.save_manager.save_game(slot_pressed, p_savename)
+	refresh_savegames()
+	slot_pressed = null
+
+
+func _on_save_name_popup_savegame_cancel():
+	pass 

game/ui/commons/save/save_game.tscn

@@ -0,0 +1,54 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://game/ui/commons/load_save_slot/load_save_slot.tscn" type="PackedScene" id=1]
+[ext_resource path="res://game/ui/commons/save/save_game.gd" type="Script" id=2]
+[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=3]
+[ext_resource path="res://game/ui/commons/save/save_name_popup.tscn" type="PackedScene" id=4]
+
+[node name="save_game" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+script = ExtResource( 2 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+slot_ui_scene = ExtResource( 1 )
+
+[node name="back" type="Button" parent="."]
+margin_left = 130.0
+margin_top = 329.0
+margin_right = 304.0
+margin_bottom = 383.0
+custom_fonts/font = ExtResource( 3 )
+text = "OPTIONS_BACK"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="ScrollContainer" type="ScrollContainer" parent="."]
+anchor_left = 0.284
+anchor_top = 0.367
+anchor_right = 0.709
+anchor_bottom = 0.94
+margin_left = 8.47998
+margin_top = 0.699982
+margin_right = 0.479919
+margin_bottom = -6.10352e-05
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="slots" type="VBoxContainer" parent="ScrollContainer"]
+margin_right = 536.0
+margin_bottom = 515.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="save_name_popup" parent="." instance=ExtResource( 4 )]
+
+[connection signal="pressed" from="back" to="." method="_on_back_pressed"]
+[connection signal="savegame_cancel" from="save_name_popup" to="." method="_on_save_name_popup_savegame_cancel"]
+[connection signal="savegame_name_ok" from="save_name_popup" to="." method="_on_save_name_popup_savegame_name_ok"]

game/ui/commons/save/save_name_popup.gd

@@ -0,0 +1,14 @@
+extends PopupDialog
+
+signal savegame_name_ok(savegame_name)
+signal savegame_cancel
+
+func _on_cancel_pressed():
+	emit_signal("savegame_cancel")
+	hide()
+
+func _on_ok_pressed():
+	if not $MarginContainer/VBoxContainer/LineEdit.text.empty():
+		emit_signal("savegame_name_ok", $MarginContainer/VBoxContainer/LineEdit.text)
+		$MarginContainer/VBoxContainer/LineEdit.clear()
+		hide()

game/ui/commons/save/save_name_popup.tscn

@@ -0,0 +1,81 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://game/ui/commons/fonts/caslonantique.tres" type="DynamicFont" id=1]
+[ext_resource path="res://game/ui/commons/save/save_name_popup.gd" type="Script" id=2]
+
+[node name="save_name_popup" type="PopupDialog"]
+margin_left = 429.0
+margin_top = 281.0
+margin_right = 863.0
+margin_bottom = 442.0
+script = ExtResource( 2 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="MarginContainer" type="MarginContainer" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+custom_constants/margin_right = 30
+custom_constants/margin_top = 30
+custom_constants/margin_left = 30
+custom_constants/margin_bottom = 30
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
+margin_left = 30.0
+margin_top = 30.0
+margin_right = 404.0
+margin_bottom = 131.0
+
+[node name="Label" type="Label" parent="MarginContainer/VBoxContainer"]
+margin_right = 374.0
+margin_bottom = 21.0
+custom_fonts/font = ExtResource( 1 )
+text = "ENTER_SAVE_NAME"
+
+[node name="LineEdit" type="LineEdit" parent="MarginContainer/VBoxContainer"]
+margin_top = 25.0
+margin_right = 374.0
+margin_bottom = 56.0
+custom_fonts/font = ExtResource( 1 )
+
+[node name="HBoxContainer" type="HBoxContainer" parent="."]
+anchor_left = 1.0
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = -224.0
+margin_top = -56.0
+margin_right = -30.0
+margin_bottom = -20.0
+custom_constants/separation = 10
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="cancel" type="Button" parent="HBoxContainer"]
+margin_right = 96.0
+margin_bottom = 36.0
+size_flags_horizontal = 3
+custom_fonts/font = ExtResource( 1 )
+text = "CANCEL"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="ok" type="Button" parent="HBoxContainer"]
+margin_left = 106.0
+margin_right = 194.0
+margin_bottom = 36.0
+size_flags_horizontal = 3
+custom_fonts/font = ExtResource( 1 )
+text = "OK"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[connection signal="pressed" from="HBoxContainer/cancel" to="." method="_on_cancel_pressed"]
+[connection signal="pressed" from="HBoxContainer/ok" to="." method="_on_ok_pressed"]

game/ui/ui_9verbs/game.gd

@@ -4,26 +4,26 @@ extends ESCGame
 """
 Implement methods to react to inputs.
 
-- left_click_on_bg(position : Vector2)
-- right_click_on_bg(position : Vector2)
-- left_double_click_on_bg(position : Vector2)
+- left_click_on_bg(position: Vector2)
+- right_click_on_bg(position: Vector2)
+- left_double_click_on_bg(position: Vector2)
 
-- element_focused(element_id : String)
+- element_focused(element_id: String)
 - element_unfocused()
 
-- left_click_on_item(item_global_id : String, event : InputEvent)
-- right_click_on_item(item_global_id : String, event : InputEvent)
-- left_double_click_on_item(item_global_id : String, event : InputEvent)
+- left_click_on_item(item_global_id: String, event: InputEvent)
+- right_click_on_item(item_global_id: String, event: InputEvent)
+- left_double_click_on_item(item_global_id: String, event: InputEvent)
 
-- left_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent)
-- right_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent)
-- left_double_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent)
-- inventory_item_focused(inventory_item_global_id : String)
+- left_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent)
+- right_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent)
+- left_double_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent)
+- inventory_item_focused(inventory_item_global_id: String)
 - inventory_item_unfocused()
 - open_inventory()
 - close_inventory()
 
-- mousewheel_action(direction : int)
+- mousewheel_action(direction: int)
 
 - hide_ui()
 - show_ui()
@@ -47,17 +47,17 @@ func _input(event):
 
 ## BACKGROUND ## 
 
-func left_click_on_bg(position : Vector2) -> void:
+func left_click_on_bg(position: Vector2) -> void:
 	escoria.do("walk", ["player", position])
 	escoria.action_manager.clear_current_action()
 	verbs_menu.unselect_actions()
 	
-func right_click_on_bg(position : Vector2) -> void:
+func right_click_on_bg(position: Vector2) -> void:
 	escoria.do("walk", ["player", position])
 	escoria.action_manager.clear_current_action()
 	verbs_menu.unselect_actions()
 	
-func left_double_click_on_bg(position : Vector2) -> void:
+func left_double_click_on_bg(position: Vector2) -> void:
 	escoria.do("walk", ["player", position, true])
 	escoria.action_manager.clear_current_action()
 	verbs_menu.unselect_actions()
@@ -65,7 +65,7 @@ func left_double_click_on_bg(position : Vector2) -> void:
 
 ## ITEM FOCUS ## 
 
-func element_focused(element_id : String) -> void:
+func element_focused(element_id: String) -> void:
 	var target_obj = escoria.object_manager.get_object(element_id).node
 	tooltip.set_target(target_obj.tooltip_name)
 	
@@ -80,30 +80,30 @@ func element_unfocused() -> void:
 
 ## ITEMS ##
 
-func left_click_on_item(item_global_id : String, event : InputEvent) -> void:
+func left_click_on_item(item_global_id: String, event: InputEvent) -> void:
 	escoria.do("item_left_click", [item_global_id, event])
 
-func right_click_on_item(item_global_id : String, event : InputEvent) -> void:
+func right_click_on_item(item_global_id: String, event: InputEvent) -> void:
 	escoria.action_manager.set_current_action(verbs_menu.selected_action)
 	escoria.do("item_right_click", [item_global_id, event])
 
-func left_double_click_on_item(item_global_id : String, event : InputEvent) -> void:
+func left_double_click_on_item(item_global_id: String, event: InputEvent) -> void:
 	escoria.do("item_left_click", [item_global_id, event]) 
 
 
 ## INVENTORY ##
-func left_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent) -> void:
+func left_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void:
 	escoria.do("item_left_click", [inventory_item_global_id, event])
 			
 
-func right_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent) -> void:
+func right_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void:
 	escoria.action_manager.set_current_action(verbs_menu.selected_action)
 	escoria.do("item_right_click", [inventory_item_global_id, event])
 
-func left_double_click_on_inventory_item(_inventory_item_global_id : String, _event : InputEvent) -> void:
+func left_double_click_on_inventory_item(_inventory_item_global_id: String, _event: InputEvent) -> void:
 	pass
 
-func inventory_item_focused(inventory_item_global_id : String) -> void:
+func inventory_item_focused(inventory_item_global_id: String) -> void:
 	var target_obj = escoria.object_manager.get_object(
 		inventory_item_global_id
 	).node
@@ -128,13 +128,14 @@ func close_inventory():
 	pass
 
 
-func mousewheel_action(_direction : int):
+func mousewheel_action(_direction: int):
 	pass
 
 
 func hide_ui():
 	$ui/panel_down.hide()
 	verbs_menu.hide()
+	$ui/panel_down/verbs_layer/room_select.hide()
 	$ui/panel_down/inventory_layer/inventory_ui.hide()
 	tooltip.hide()
 
@@ -142,6 +143,7 @@ func hide_ui():
 func show_ui():
 	$ui/panel_down.show()
 	verbs_menu.show()
+	$ui/panel_down/verbs_layer/room_select.show()
 	$ui/panel_down/inventory_layer/inventory_ui.show()
 	tooltip.show()
 

game/ui/ui_9verbs/inventory/inventory_ui_container.gd

@@ -5,8 +5,8 @@ This script is totally user-defined. It does exactly what the user wants the
 inventory to look like. It only requires 4 functions to be defined:
 	- is_empty() -> bool
 	- get_items() -> Array
-	- add_item(inventory_item : ESCInventoryItem)
-	- remove_item(inventory_item : ESCInventoryItem)
+	- add_item(inventory_item: ESCInventoryItem)
+	- remove_item(inventory_item: ESCInventoryItem)
 The user is free to implement these methods the way s-he likes.
 """
 
@@ -18,7 +18,7 @@ func is_empty() -> bool:
 func get_items() -> Array:
 	return current_nodes_in_container.keys()
 
-func add_item(inventory_item : ESCInventoryItem):
+func add_item(inventory_item: ESCInventoryItem):
 	var center_container = CenterContainer.new()
 	center_container.size_flags_horizontal = SIZE_EXPAND_FILL
 	center_container.connect("mouse_entered", inventory_item, "_on_inventory_item_mouse_enter")
@@ -28,7 +28,7 @@ func add_item(inventory_item : ESCInventoryItem):
 	add_child(center_container)
 	current_nodes_in_container[inventory_item] = center_container
 
-func remove_item(inventory_item : ESCInventoryItem):
+func remove_item(inventory_item: ESCInventoryItem):
 	var node_to_remove = current_nodes_in_container[inventory_item]
 	current_nodes_in_container.erase(node_to_remove)
 	node_to_remove.disconnect("mouse_entered", inventory_item, "_on_inventory_item_mouse_enter")

game/ui/ui_9verbs/verbs_menu.gd

@@ -13,7 +13,7 @@ func _ready():
 		but.connect("pressed", self, "_on_action_selected", [but.name])
 		but.toggle_mode = true
 
-func _on_action_selected(action : String):
+func _on_action_selected(action: String):
 	escoria.action_manager.set_current_action(action)
 
 	for but in get_children():
@@ -23,7 +23,7 @@ func unselect_actions():
 	for but in get_children():
 		but.set_pressed(false)
 
-func set_by_name(action_name : String):
+func set_by_name(action_name: String):
 	selected_action = action_name
 	for but in get_children():
 		but.set_pressed(but.get_name() == action_name)

game/ui/ui_mouse_icons/game.gd

@@ -4,26 +4,26 @@ extends ESCGame
 """
 Implement methods to react to inputs.
 
-- left_click_on_bg(position : Vector2)
-- right_click_on_bg(position : Vector2)
-- left_double_click_on_bg(position : Vector2)
+- left_click_on_bg(position: Vector2)
+- right_click_on_bg(position: Vector2)
+- left_double_click_on_bg(position: Vector2)
 
-- element_focused(element_id : String)
+- element_focused(element_id: String)
 - element_unfocused()
 
-- left_click_on_item(item_global_id : String, event : InputEvent)
-- right_click_on_item(item_global_id : String, event : InputEvent)
-- left_double_click_on_item(item_global_id : String, event : InputEvent)
+- left_click_on_item(item_global_id: String, event: InputEvent)
+- right_click_on_item(item_global_id: String, event: InputEvent)
+- left_double_click_on_item(item_global_id: String, event: InputEvent)
 
-- left_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent)
-- right_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent)
-- left_double_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent)
-- inventory_item_focused(inventory_item_global_id : String)
+- left_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent)
+- right_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent)
+- left_double_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent)
+- inventory_item_focused(inventory_item_global_id: String)
 - inventory_item_unfocused()
 - open_inventory()
 - close_inventory()
 
-- mousewheel_action(direction : int)
+- mousewheel_action(direction: int)
 
 - hide_ui()
 - show_ui()
@@ -37,24 +37,24 @@ func _ready():
 
 ## BACKGROUND ## 
 
-func left_click_on_bg(position : Vector2) -> void:
+func left_click_on_bg(position: Vector2) -> void:
 	escoria.do("walk", ["player", position])
 	$ui/verbs_layer/verbs_menu.set_by_name("walk")
 	$ui/verbs_layer/verbs_menu.clear_tool_texture()
 	
-func right_click_on_bg(position : Vector2) -> void:
+func right_click_on_bg(position: Vector2) -> void:
 	escoria.do("walk", ["player", position])
 	$ui/verbs_layer/verbs_menu.set_by_name("walk")
 	$ui/verbs_layer/verbs_menu.clear_tool_texture()
 	
-func left_double_click_on_bg(position : Vector2) -> void:
+func left_double_click_on_bg(position: Vector2) -> void:
 	escoria.do("walk", ["player", position, true])
 	$ui/verbs_layer/verbs_menu.set_by_name("walk")
 	$ui/verbs_layer/verbs_menu.clear_tool_texture()
 
 ## ITEM/HOTSPOT FOCUS ## 
 
-func element_focused(element_id : String) -> void:
+func element_focused(element_id: String) -> void:
 	var target_obj = escoria.object_manager.get_object(element_id).node
 	$ui/tooltip_layer/tooltip.set_target(target_obj.tooltip_name)
 
@@ -69,42 +69,49 @@ func element_unfocused() -> void:
 
 ## ITEMS ##
 
-func left_click_on_item(item_global_id : String, event : InputEvent) -> void:
+func left_click_on_item(item_global_id: String, event: InputEvent) -> void:
 	escoria.do("item_left_click", [item_global_id, event])
 
-func right_click_on_item(item_global_id : String, event : InputEvent) -> void:
+func right_click_on_item(item_global_id: String, event: InputEvent) -> void:
 	escoria.do("item_right_click", [item_global_id, event])
 
-func left_double_click_on_item(item_global_id : String, event : InputEvent) -> void:
+func left_double_click_on_item(item_global_id: String, event: InputEvent) -> void:
 	escoria.do("item_left_click", [item_global_id, event]) 
 
 
 ## INVENTORY ##
-func left_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent) -> void:
+func left_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void:
 	escoria.do("item_left_click", [inventory_item_global_id, event])
 	if escoria.action_manager.current_action == "use":
 		var item = escoria.object_manager.get_object(
 			inventory_item_global_id
 		).node
 		if item.get_node("sprite").texture:
-			$ui/verbs_layer/verbs_menu.set_tool_texture(item.get_node("sprite").texture)
+			$ui/verbs_layer/verbs_menu.set_tool_texture(
+				item.get_node("sprite").texture
+			)
 		elif item.inventory_item.texture_normal:
-			$ui/verbs_layer/verbs_menu.set_tool_texture(item.inventory_item.texture_normal)
+			$ui/verbs_layer/verbs_menu.set_tool_texture(
+				item.inventory_item.texture_normal
+			)
 			
 
-func right_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent) -> void:
+func right_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void:
 	escoria.do("item_right_click", [inventory_item_global_id, event])
 
-func left_double_click_on_inventory_item(inventory_item_global_id : String, event : InputEvent) -> void:
+
+func left_double_click_on_inventory_item(inventory_item_global_id: String, event: InputEvent) -> void:
 	pass
 
-func inventory_item_focused(inventory_item_global_id : String) -> void:
+
+func inventory_item_focused(inventory_item_global_id: String) -> void:
 	$ui/tooltip_layer/tooltip.set_target(
 		escoria.object_manager.get_object(
 			inventory_item_global_id
 		).node.tooltip_name
 	)
 
+
 func inventory_item_unfocused() -> void:
 	$ui/tooltip_layer/tooltip.set_target("")
 
@@ -116,7 +123,7 @@ func open_inventory():
 func close_inventory():
 	$ui/inventory_layer/inventory_ui/inventory_button.close_inventory()
 
-func mousewheel_action(direction : int):
+func mousewheel_action(direction: int):
 	$ui/verbs_layer/verbs_menu.iterate_actions_cursor(direction)
 
 func hide_ui():

game/ui/ui_mouse_icons/inventory/inventory_showhide.gd

@@ -1,6 +1,6 @@
 extends Control
 
-var showed : bool = false
+var showed: bool = false
 
 func _ready():
 	pass

game/ui/ui_mouse_icons/inventory/inventory_ui_container.gd

@@ -5,8 +5,8 @@ This script is totally user-defined. It does exactly what the user wants the
 inventory to look like. It only requires 4 functions to be defined:
 	- is_empty() -> bool
 	- get_items() -> Array
-	- add_item(inventory_item : ESCInventoryItem)
-	- remove_item(inventory_item : ESCInventoryItem)
+	- add_item(inventory_item: ESCInventoryItem)
+	- remove_item(inventory_item: ESCInventoryItem)
 The user is free to implement these methods the way s-he likes.
 """
 
@@ -18,7 +18,7 @@ func is_empty() -> bool:
 func get_items() -> Array:
 	return current_nodes_in_container.keys()
 
-func add_item(inventory_item : ESCInventoryItem):
+func add_item(inventory_item: ESCInventoryItem):
 	var center_container = CenterContainer.new()
 	center_container.size_flags_horizontal = SIZE_EXPAND_FILL
 	center_container.connect("mouse_entered", inventory_item, "_on_inventory_item_mouse_enter")
@@ -27,7 +27,7 @@ func add_item(inventory_item : ESCInventoryItem):
 	add_child(center_container)
 	current_nodes_in_container[inventory_item] = center_container
 
-func remove_item(inventory_item : ESCInventoryItem):
+func remove_item(inventory_item: ESCInventoryItem):
 	var node_to_remove = current_nodes_in_container[inventory_item]
 	current_nodes_in_container.erase(node_to_remove)
 	node_to_remove.disconnect("mouse_entered", inventory_item, "_on_inventory_item_mouse_enter")

game/ui/ui_mouse_icons/verbs_mouseicons.gd

@@ -2,8 +2,8 @@ tool
 extends Control
 
 
-var current_cursor_id : int = 0
-onready var cursors : Array = $actions.get_children()
+var current_cursor_id: int = 0
+onready var cursors: Array = $actions.get_children()
 
 
 """
@@ -24,7 +24,7 @@ func _process(delta):
 	$mouse_position.rect_global_position = get_global_mouse_position()
 
 
-func iterate_actions_cursor(direction : int):
+func iterate_actions_cursor(direction: int):
 	current_cursor_id += direction
 	if current_cursor_id > cursors.size() - 1:
 		current_cursor_id = 0
@@ -36,7 +36,7 @@ func iterate_actions_cursor(direction : int):
 	if $mouse_position/tool.texture != null:
 		clear_tool_texture()
 
-func set_by_name(name : String) -> void:
+func set_by_name(name: String) -> void:
 	for i in cursors.size():
 		if cursors[i].name == name:
 			current_cursor_id = i
@@ -45,7 +45,7 @@ func set_by_name(name : String) -> void:
 	Input.set_custom_mouse_cursor(cursors[current_cursor_id].texture)
 	escoria.action_manager.set_current_action(cursors[current_cursor_id].name)
 
-func set_tool_texture(texture : Texture):
+func set_tool_texture(texture: Texture):
 	set_process(true)
 	$mouse_position/tool.texture = texture