feat(godot4): project automatic upgrade from godot 3 to 4

This commit is contained in:
2025-01-19 01:05:35 +01:00
parent c6e768f18e
commit f34f96e87f
98 changed files with 844 additions and 1784 deletions

View File

@@ -3,8 +3,8 @@
extends ESCDialogOptionsChooser extends ESCDialogOptionsChooser
export(Color, RGB) var color_normal = Color(1.0,1.0,1.0,1.0) @export var color_normal = Color(1.0,1.0,1.0,1.0) # (Color, RGB)
export(Color, RGB) var color_hover = Color(165.0,42.0,42.0, 1.0) @export var color_hover = Color(165.0,42.0,42.0, 1.0) # (Color, RGB)
var _no_more_options: bool = false var _no_more_options: bool = false
@@ -13,9 +13,9 @@ var _no_more_options: bool = false
# Hide the chooser at the start just to be safe # Hide the chooser at the start just to be safe
func _ready() -> void: func _ready() -> void:
hide_chooser() hide_chooser()
pause_mode = PAUSE_MODE_STOP process_mode = PROCESS_MODE_PAUSABLE
escoria.connect("paused", self, "_on_paused") escoria.connect("paused", Callable(self, "_on_paused"))
escoria.connect("resumed", self, "_on_resumed") escoria.connect("resumed", Callable(self, "_on_resumed"))
# Process the timeout display # Process the timeout display
@@ -39,8 +39,8 @@ func show_chooser():
var _option_node = Button.new() var _option_node = Button.new()
_option_node.text = (option as ESCDialogOption).option _option_node.text = (option as ESCDialogOption).option
_option_node.flat = true _option_node.flat = true
_option_node.add_color_override("font_color", color_normal) _option_node.add_theme_color_override("font_color", color_normal)
_option_node.add_color_override("font_color_hover", color_hover) _option_node.add_theme_color_override("font_color_hover", color_hover)
_vbox.add_child(_option_node) _vbox.add_child(_option_node)
_option_node.connect("pressed", self, "_on_answer_selected", [ _option_node.connect("pressed", self, "_on_answer_selected", [
option option
@@ -57,7 +57,7 @@ func show_chooser():
if self.dialog.avatar != "-": if self.dialog.avatar != "-":
$AvatarContainer.add_child( $AvatarContainer.add_child(
ResourceLoader.load(self.dialog.avatar).instance() ResourceLoader.load(self.dialog.avatar).instantiate()
) )
$MarginContainer.show() $MarginContainer.show()

View File

@@ -4,44 +4,44 @@
[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" type="Theme" id=2] [ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" type="Theme" id=2]
[sub_resource type="Gradient" id=1] [sub_resource type="Gradient" id=1]
colors = PoolColorArray( 1, 0, 0, 1, 1, 0, 0, 1 ) colors = PackedColorArray( 1, 0, 0, 1, 1, 0, 0, 1 )
[sub_resource type="GradientTexture" id=2] [sub_resource type="GradientTexture2D" id=2]
gradient = SubResource( 1 ) gradient = SubResource( 1 )
[node name="text_dialog_choice" type="Control"] [node name="text_dialog_choice" type="Control"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
margin_top = 560.0 offset_top = 560.0
margin_right = 7.0 offset_right = 7.0
theme = ExtResource( 2 ) theme = ExtResource( 2 )
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="MarginContainer" type="MarginContainer" parent="."] [node name="MarginContainer" type="MarginContainer" parent="."]
margin_left = 20.0 offset_left = 20.0
margin_top = 10.0 offset_top = 10.0
margin_right = 1280.0 offset_right = 1280.0
margin_bottom = 185.0 offset_bottom = 185.0
mouse_filter = 2 mouse_filter = 2
custom_constants/margin_top = 20 theme_override_constants/margin_top = 20
custom_constants/margin_left = 20 theme_override_constants/margin_left = 20
[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer"] [node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer"]
margin_left = 20.0 offset_left = 20.0
margin_top = 20.0 offset_top = 20.0
margin_right = 1260.0 offset_right = 1260.0
margin_bottom = 175.0 offset_bottom = 175.0
scroll_horizontal_enabled = false scroll_horizontal_enabled = false
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/ScrollContainer"] [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/ScrollContainer"]
margin_right = 1240.0 offset_right = 1240.0
margin_bottom = 155.0 offset_bottom = 155.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
custom_constants/separation = 10 theme_override_constants/separation = 10
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
@@ -49,9 +49,9 @@ __meta__ = {
[node name="Timer" type="Timer" parent="."] [node name="Timer" type="Timer" parent="."]
one_shot = true one_shot = true
[node name="TimerProgress" type="TextureProgress" parent="."] [node name="TimerProgress" type="TextureProgressBar" parent="."]
anchor_right = 1.0 anchor_right = 1.0
rect_min_size = Vector2( 0, 20 ) custom_minimum_size = Vector2( 0, 20 )
texture_progress = SubResource( 2 ) texture_progress = SubResource( 2 )
nine_patch_stretch = true nine_patch_stretch = true

View File

@@ -44,7 +44,7 @@ func run(_command_params: Array) -> int:
"", "",
text text
) )
yield(escoria.dialog_player, "say_finished") await escoria.dialog_player.say_finished
escoria.current_state = escoria.GAME_STATE.DEFAULT escoria.current_state = escoria.GAME_STATE.DEFAULT
return ESCExecution.RC_OK return ESCExecution.RC_OK

View File

@@ -54,7 +54,7 @@ func configure() -> ESCCommandArgumentDescriptor:
# Validate whether the given arguments match the command descriptor # Validate whether the given arguments match the command descriptor
func validate(arguments: Array): func validate(arguments: Array):
if not .validate(arguments): if not super.validate(arguments):
return false return false
if arguments[0].to_upper() != CURRENT_PLAYER_KEYWORD \ if arguments[0].to_upper() != CURRENT_PLAYER_KEYWORD \
@@ -105,7 +105,7 @@ func run(command_params: Array) -> int:
"", "",
text text
) )
yield(escoria.dialog_player, "say_finished") await escoria.dialog_player.say_finished
escoria.current_state = escoria.GAME_STATE.DEFAULT escoria.current_state = escoria.GAME_STATE.DEFAULT
var current_count_global_key = "%s_count" % [param_list_id] var current_count_global_key = "%s_count" % [param_list_id]

View File

@@ -52,7 +52,7 @@ func configure() -> ESCCommandArgumentDescriptor:
# Validate whether the given arguments match the command descriptor # Validate whether the given arguments match the command descriptor
func validate(arguments: Array): func validate(arguments: Array):
if not .validate(arguments): if not super.validate(arguments):
return false return false
if arguments[0].to_upper() != CURRENT_PLAYER_KEYWORD \ if arguments[0].to_upper() != CURRENT_PLAYER_KEYWORD \
@@ -109,7 +109,7 @@ func run(command_params: Array) -> int:
"", "",
text text
) )
yield(escoria.dialog_player, "say_finished") await escoria.dialog_player.say_finished
escoria.current_state = escoria.GAME_STATE.DEFAULT escoria.current_state = escoria.GAME_STATE.DEFAULT
current_index += 1 current_index += 1

View File

@@ -1,13 +1,13 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/dialog_tip.tres" type="DynamicFont" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/dialog_tip.tres" type="FontFile" id=1]
[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.gd" type="Script" id=2] [ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.gd" type="Script" id=2]
[node name="Label" type="Label"] [node name="Label" type="Label"]
margin_left = 1057.0 offset_left = 1057.0
margin_top = 533.0 offset_top = 533.0
margin_right = 1259.0 offset_right = 1259.0
margin_bottom = 551.0 offset_bottom = 551.0
custom_fonts/font = ExtResource( 1 ) theme_override_fonts/font = ExtResource( 1 )
text = "Haz click para acelerar el texto" text = "Haz click para acelerar el texto"
script = ExtResource( 2 ) script = ExtResource( 2 )

View File

@@ -16,18 +16,18 @@ the node that inherits from this state machine interface
If you don't the game will crash (on purpose, so you won't If you don't the game will crash (on purpose, so you won't
forget to initialize the state machine) forget to initialize the state machine)
""" """
export(NodePath) var START_STATE @export var START_STATE: NodePath
var states_map = {} var states_map = {}
var states_stack = [] # can also be used as a pushdown automaton var states_stack = [] # can also be used as a pushdown automaton
var current_state = null var current_state = null
var current_state_name = "" var current_state_name = ""
var _active = false setget set_active var _active = false: set = set_active
func initialize(start_state): func initialize(start_state):
for child in get_children(): for child in get_children():
child.connect("finished", self, "_change_state") child.connect("finished", Callable(self, "_change_state"))
set_active(true) set_active(true)
states_stack.push_front(start_state) states_stack.push_front(start_state)

View File

@@ -1,5 +1,5 @@
@tool
# A simple dialog manager for Escoria # A simple dialog manager for Escoria
tool
extends EditorPlugin extends EditorPlugin
@@ -10,23 +10,23 @@ const READING_SPEED_IN_WPM_DEFAULT_VALUE = 200
const TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE = 100 const TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE = 100
const TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE = 25 const TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE = 25
var left_click_actions: PoolStringArray = [ var left_click_actions: PackedStringArray = [
RTMISimpleDialogSettings.LEFT_CLICK_ACTION_SPEED_UP, RTMISimpleDialogSettings.LEFT_CLICK_ACTION_SPEED_UP,
RTMISimpleDialogSettings.LEFT_CLICK_ACTION_INSTANT_FINISH, RTMISimpleDialogSettings.LEFT_CLICK_ACTION_INSTANT_FINISH,
RTMISimpleDialogSettings.LEFT_CLICK_ACTION_NOTHING RTMISimpleDialogSettings.LEFT_CLICK_ACTION_NOTHING
] ]
var stop_talking_animation_on_options: PoolStringArray = [ var stop_talking_animation_on_options: PackedStringArray = [
RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON_END_OF_TEXT, RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON_END_OF_TEXT,
RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON_END_OF_AUDIO RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON_END_OF_AUDIO
] ]
# Override function to return the plugin name. # Override function to return the plugin name.
func get_plugin_name(): func _get_plugin_name():
return "escoria-rtmi-dialog-simple" return "escoria-rtmi-dialog-simple"
# Unregister ourselves # Unregister ourselves
func disable_plugin(): func _disable_plugin():
print("Disabling plugin Escoria Dialog Simple") print("Disabling plugin Escoria Dialog Simple")
ESCProjectSettingsManager.remove_setting( ESCProjectSettingsManager.remove_setting(
ESCProjectSettingsManager.DEFAULT_DIALOG_TYPE ESCProjectSettingsManager.DEFAULT_DIALOG_TYPE
@@ -89,7 +89,7 @@ func enable_plugin():
RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS, RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS,
TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE, TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE,
{ {
"type": TYPE_REAL "type": TYPE_FLOAT
} }
) )
@@ -97,7 +97,7 @@ func enable_plugin():
RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST, RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST,
TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE, TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE,
{ {
"type": TYPE_REAL "type": TYPE_FLOAT
} }
) )
@@ -117,7 +117,7 @@ func enable_plugin():
} }
) )
var left_click_actions_string: String = left_click_actions.join(",") var left_click_actions_string: String = ",".join(left_click_actions)
ESCProjectSettingsManager.register_setting( ESCProjectSettingsManager.register_setting(
RTMISimpleDialogSettings.LEFT_CLICK_ACTION, RTMISimpleDialogSettings.LEFT_CLICK_ACTION,
@@ -129,7 +129,7 @@ func enable_plugin():
} }
) )
var stop_talking_animation_on_options_string: String = stop_talking_animation_on_options.join(",") var stop_talking_animation_on_options_string: String = ",".join(stop_talking_animation_on_options)
ESCProjectSettingsManager.register_setting( ESCProjectSettingsManager.register_setting(
RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON, RTMISimpleDialogSettings.STOP_TALKING_ANIMATION_ON,
@@ -143,6 +143,6 @@ func enable_plugin():
else: else:
get_editor_interface().set_plugin_enabled( get_editor_interface().set_plugin_enabled(
get_plugin_name(), _get_plugin_name(),
false false
) )

View File

@@ -26,7 +26,7 @@ var _should_preserve_dialog_box: bool = false
func _ready() -> void: func _ready() -> void:
add_child(state_machine) add_child(state_machine)
escoria.connect("paused", self, "_on_paused") escoria.connect("paused", Callable(self, "_on_paused"))
@@ -122,17 +122,17 @@ func _init_type_player(type: String) -> void:
if type == "floating": if type == "floating":
_type_player = preload(\ _type_player = preload(\
"res://addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn"\ "res://addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn"\
).instance() ).instantiate()
else: else:
_type_player = preload(\ _type_player = preload(\
"res://addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn"\ "res://addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn"\
).instance() ).instantiate()
_dialog_tip = preload(\ _dialog_tip = preload(\
"res://addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn"\ "res://addons/escoria-ui-return-monkey-island-dialog-simple/dialog_tip.tscn"\
).instance() ).instantiate()
_type_player.connect("say_finished", self, "_on_say_finished") _type_player.connect("say_finished", Callable(self, "_on_say_finished"))
_type_player.connect("say_visible", self, "_on_say_visible") _type_player.connect("say_visible", Callable(self, "_on_say_visible"))
func _initialize_say_states(global_id: String, text: String, type: String) -> void: func _initialize_say_states(global_id: String, text: String, type: String) -> void:
state_machine.states_map["say"].initialize(self, global_id, text, type) state_machine.states_map["say"].initialize(self, global_id, text, type)
@@ -177,12 +177,12 @@ func do_choose(dialog_player: Node, dialog: ESCDialog, type: String = "simple"):
if type == "simple" or type == "": if type == "simple" or type == "":
chooser = preload(\ chooser = preload(\
"res://addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn"\ "res://addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn"\
).instance() ).instantiate()
dialog_player.add_child(chooser) dialog_player.add_child(chooser)
chooser.set_dialog(dialog) chooser.set_dialog(dialog)
chooser.show_chooser() chooser.show_chooser()
var option = yield(chooser, "option_chosen") var option = await chooser.option_chosen
dialog_player.remove_child(chooser) dialog_player.remove_child(chooser)
# MODIFIED FOR RETURN TO MONKEY UI # MODIFIED FOR RETURN TO MONKEY UI
if option is ESCDialogOption: if option is ESCDialogOption:

View File

@@ -23,7 +23,7 @@ func initialize(dialog_player, dialog_chooser_ui: ESCDialogManager, dialog: ESCD
func enter(): func enter():
escoria.logger.trace(self, "Dialog State Machine: Entered 'choices'.") escoria.logger.trace(self, "Dialog State Machine: Entered 'choices'.")
if _dialog.options.empty(): if _dialog.options.is_empty():
escoria.logger.error( escoria.logger.error(
self, self,
"Received dialog options array was empty." "Received dialog options array was empty."
@@ -36,7 +36,7 @@ func update(_delta):
if _ready_to_choose: if _ready_to_choose:
_ready_to_choose = false _ready_to_choose = false
_dialog_chooser_ui.do_choose(_dialog_player, _dialog, _type) _dialog_chooser_ui.do_choose(_dialog_player, _dialog, _type)
var option = yield(_dialog_chooser_ui, "option_chosen") var option = await _dialog_chooser_ui.option_chosen
escoria.logger.trace(self, "Dialog State Machine: 'choices' -> 'idle'") escoria.logger.trace(self, "Dialog State Machine: 'choices' -> 'idle'")

View File

@@ -13,8 +13,8 @@ func enter():
escoria.logger.trace(self, "Dialog State Machine: Entered 'interrupt'.") escoria.logger.trace(self, "Dialog State Machine: Entered 'interrupt'.")
if _dialog_manager != null: if _dialog_manager != null:
if not _dialog_manager.is_connected("say_finished", self, "_on_say_finished"): if not _dialog_manager.is_connected("say_finished", Callable(self, "_on_say_finished")):
_dialog_manager.connect("say_finished", self, "_on_say_finished") _dialog_manager.connect("say_finished", Callable(self, "_on_say_finished"))
_dialog_manager.interrupt() _dialog_manager.interrupt()

View File

@@ -53,26 +53,26 @@ func handle_input(_event):
func _handle_left_click_action(left_click_action: String) -> void: func _handle_left_click_action(left_click_action: String) -> void:
match left_click_action: match left_click_action:
RTMISimpleDialogSettings.LEFT_CLICK_ACTION_SPEED_UP: RTMISimpleDialogSettings.LEFT_CLICK_ACTION_SPEED_UP:
if _dialog_manager.is_connected("say_visible", self, "_on_say_visible"): if _dialog_manager.is_connected("say_visible", Callable(self, "_on_say_visible")):
_dialog_manager.disconnect("say_visible", self, "_on_say_visible") _dialog_manager.disconnect("say_visible", Callable(self, "_on_say_visible"))
escoria.logger.trace(self, "Dialog State Machine: 'say' -> 'say_fast'") escoria.logger.trace(self, "Dialog State Machine: 'say' -> 'say_fast'")
emit_signal("finished", "say_fast") emit_signal("finished", "say_fast")
RTMISimpleDialogSettings.LEFT_CLICK_ACTION_INSTANT_FINISH: RTMISimpleDialogSettings.LEFT_CLICK_ACTION_INSTANT_FINISH:
if _dialog_manager.is_connected("say_visible", self, "_on_say_visible"): if _dialog_manager.is_connected("say_visible", Callable(self, "_on_say_visible")):
_dialog_manager.disconnect("say_visible", self, "_on_say_visible") _dialog_manager.disconnect("say_visible", Callable(self, "_on_say_visible"))
escoria.logger.trace(self, "Dialog State Machine: 'say' -> 'say_finish'") escoria.logger.trace(self, "Dialog State Machine: 'say' -> 'say_finish'")
emit_signal("finished", "say_finish") emit_signal("finished", "say_finish")
get_tree().set_input_as_handled() get_viewport().set_input_as_handled()
func enter(): func enter():
escoria.logger.trace(self, "Dialog State Machine: Entered 'say'.") escoria.logger.trace(self, "Dialog State Machine: Entered 'say'.")
if not _dialog_manager.is_connected("say_visible", self, "_on_say_visible"): if not _dialog_manager.is_connected("say_visible", Callable(self, "_on_say_visible")):
_dialog_manager.connect("say_visible", self, "_on_say_visible") _dialog_manager.connect("say_visible", Callable(self, "_on_say_visible"))
var matches = _keytext_regex.search(_text) var matches = _keytext_regex.search(_text)
@@ -104,12 +104,12 @@ func enter():
if not ( if not (
escoria.object_manager.get_object(escoria.object_manager.SPEECH).node\ escoria.object_manager.get_object(escoria.object_manager.SPEECH).node\
as ESCSpeechPlayer as ESCSpeechPlayer
).stream.is_connected("finished", self, "_on_audio_finished"): ).stream.is_connected("finished", Callable(self, "_on_audio_finished")):
( (
escoria.object_manager.get_object(escoria.object_manager.SPEECH).node\ escoria.object_manager.get_object(escoria.object_manager.SPEECH).node\
as ESCSpeechPlayer as ESCSpeechPlayer
).stream.connect("finished", self, "_on_audio_finished") ).stream.connect("finished", Callable(self, "_on_audio_finished"))
var translated_text: String = tr(matches.get_string("key")) var translated_text: String = tr(matches.get_string("key"))
@@ -118,7 +118,7 @@ func enter():
if translated_text == matches.get_string("key"): if translated_text == matches.get_string("key"):
escoria.logger.warn( escoria.logger.warn(
self, self,
"Unable to find translation key '%s'. Using untranslated text." % matches.get_string("key") "Unable to find position key '%s'. Using untranslated text." % matches.get_string("key")
) )
_text = matches.get_string("text") _text = matches.get_string("text")
else: else:
@@ -148,9 +148,9 @@ func _get_voice_file(key: String, start: String = "") -> String:
start = ESCProjectSettingsManager.get_setting( start = ESCProjectSettingsManager.get_setting(
ESCProjectSettingsManager.SPEECH_FOLDER ESCProjectSettingsManager.SPEECH_FOLDER
) )
var _dir = Directory.new() var _dir = DirAccess.new()
if _dir.open(start) == OK: if _dir.open(start) == OK:
_dir.list_dir_begin(true, true) _dir.list_dir_begin() # TODOConverter3To4 fill missing arguments https://github.com/godotengine/godot/pull/40547
var file_name = _dir.get_next() var file_name = _dir.get_next()
while file_name != "": while file_name != "":
if _dir.current_is_dir(): if _dir.current_is_dir():

View File

@@ -16,8 +16,8 @@ func enter():
escoria.inputs_manager.INPUT_NONE and \ escoria.inputs_manager.INPUT_NONE and \
_dialog_manager != null: _dialog_manager != null:
if not _dialog_manager.is_connected("say_visible", self, "_on_say_visible"): if not _dialog_manager.is_connected("say_visible", Callable(self, "_on_say_visible")):
_dialog_manager.connect("say_visible", self, "_on_say_visible") _dialog_manager.connect("say_visible", Callable(self, "_on_say_visible"))
_dialog_manager.speedup() _dialog_manager.speedup()
else: else:

View File

@@ -16,8 +16,8 @@ func enter():
escoria.inputs_manager.INPUT_NONE and \ escoria.inputs_manager.INPUT_NONE and \
_dialog_manager != null: _dialog_manager != null:
if not _dialog_manager.is_connected("say_visible", self, "_on_say_visible"): if not _dialog_manager.is_connected("say_visible", Callable(self, "_on_say_visible")):
_dialog_manager.connect("say_visible", self, "_on_say_visible") _dialog_manager.connect("say_visible", Callable(self, "_on_say_visible"))
_dialog_manager.finish() _dialog_manager.finish()
else: else:

View File

@@ -12,8 +12,8 @@ func initialize(dialog_manager: ESCDialogManager) -> void:
func enter(): func enter():
escoria.logger.trace(self, "Dialog State Machine: Entered 'visible'.") escoria.logger.trace(self, "Dialog State Machine: Entered 'visible'.")
if not _dialog_manager.is_connected("say_finished", self, "_on_say_finished"): if not _dialog_manager.is_connected("say_finished", Callable(self, "_on_say_finished")):
_dialog_manager.connect("say_finished", self, "_on_say_finished") _dialog_manager.connect("say_finished", Callable(self, "_on_say_finished"))
func handle_input(_event): func handle_input(_event):
@@ -21,11 +21,11 @@ func handle_input(_event):
if escoria.inputs_manager.input_mode != \ if escoria.inputs_manager.input_mode != \
escoria.inputs_manager.INPUT_NONE: escoria.inputs_manager.INPUT_NONE:
if _dialog_manager.is_connected("say_finished", self, "_on_say_finished"): if _dialog_manager.is_connected("say_finished", Callable(self, "_on_say_finished")):
_dialog_manager.disconnect("say_finished", self, "_on_say_finished") _dialog_manager.disconnect("say_finished", Callable(self, "_on_say_finished"))
emit_signal("finished", "interrupt") emit_signal("finished", "interrupt")
get_tree().set_input_as_handled() get_viewport().set_input_as_handled()
# Handles the end of a say function after it has emitted say_finished. # Handles the end of a say function after it has emitted say_finished.

View File

@@ -1,6 +1,6 @@
[gd_resource type="Theme" load_steps=3 format=2] [gd_resource type="Theme" load_steps=3 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres" type="DynamicFont" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres" type="FontFile" id=1]
[sub_resource type="StyleBoxFlat" id=1] [sub_resource type="StyleBoxFlat" id=1]
content_margin_left = 5.0 content_margin_left = 5.0

View File

@@ -30,17 +30,17 @@ var _current_line: String
# The node holding the avatar # The node holding the avatar
onready var avatar_node = $Panel/MarginContainer/HSplitContainer/VBoxContainer\ @onready var avatar_node = $Panel/MarginContainer/HSplitContainer/VBoxContainer\
/avatar /avatar
# The node showing the text # The node showing the text
onready var text_node = $Panel/MarginContainer/HSplitContainer/text @onready var text_node = $Panel/MarginContainer/HSplitContainer/text
# The tween node for text animations # The tween node for text animations
onready var tween = $Panel/MarginContainer/HSplitContainer/text/Tween @onready var tween = $Panel/MarginContainer/HSplitContainer/text/Tween
# Whether the dialog manager is paused # Whether the dialog manager is paused
onready var is_paused: bool = true @onready var is_paused: bool = true
@@ -103,8 +103,8 @@ func _ready():
"_on_dialog_line_typed" "_on_dialog_line_typed"
) )
escoria.connect("paused", self, "_on_paused") escoria.connect("paused", Callable(self, "_on_paused"))
escoria.connect("resumed", self, "_on_resumed") escoria.connect("resumed", Callable(self, "_on_resumed"))
# Switch the current character # Switch the current character
@@ -112,7 +112,7 @@ func _ready():
# #### Parameters # #### Parameters
# - name: The name of the current character # - name: The name of the current character
func set_current_character(name: String): func set_current_character(name: String):
if ProjectSettings.get_setting("escoria/dialog_simple/avatars_path").empty(): if ProjectSettings.get_setting("escoria/dialog_simple/avatars_path").is_empty():
escoria.logger.warn(self, "Unable to load avatar '%s': Avatar path not specified" % name) escoria.logger.warn(self, "Unable to load avatar '%s': Avatar path not specified" % name)
return return
@@ -143,7 +143,7 @@ func say(character: String, line: String):
popup_centered() popup_centered()
set_current_character(character) set_current_character(character)
text_node.bbcode_text = tr(line) text_node.text = tr(line)
text_node.percent_visible = 0.0 text_node.percent_visible = 0.0
var time_show_full_text = _text_time_per_character / 1000 * len(line) var time_show_full_text = _text_time_per_character / 1000 * len(line)
@@ -192,7 +192,7 @@ func _on_dialog_line_typed(object, key):
var time_to_disappear: float = _calculate_time_to_disappear() var time_to_disappear: float = _calculate_time_to_disappear()
$Timer.start(time_to_disappear) $Timer.start(time_to_disappear)
$Timer.connect("timeout", self, "_on_dialog_finished") $Timer.connect("timeout", Callable(self, "_on_dialog_finished"))
emit_signal("say_visible") emit_signal("say_visible")

View File

@@ -5,8 +5,8 @@
[node name="dialog_box" type="Popup"] [node name="dialog_box" type="Popup"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
margin_right = -782.0 offset_right = -782.0
margin_bottom = -734.0 offset_bottom = -734.0
script = ExtResource( 1 ) script = ExtResource( 1 )
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
@@ -24,42 +24,42 @@ __meta__ = {
[node name="MarginContainer" type="MarginContainer" parent="Panel"] [node name="MarginContainer" type="MarginContainer" parent="Panel"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
custom_constants/margin_right = 20 theme_override_constants/margin_right = 20
custom_constants/margin_top = 20 theme_override_constants/margin_top = 20
custom_constants/margin_left = 20 theme_override_constants/margin_left = 20
custom_constants/margin_bottom = 20 theme_override_constants/margin_bottom = 20
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="HSplitContainer" type="HSplitContainer" parent="Panel/MarginContainer"] [node name="HSplitContainer" type="HSplitContainer" parent="Panel/MarginContainer"]
margin_left = 20.0 offset_left = 20.0
margin_top = 20.0 offset_top = 20.0
margin_right = 478.0 offset_right = 478.0
margin_bottom = 146.0 offset_bottom = 146.0
custom_constants/separation = 35 theme_override_constants/separation = 35
dragger_visibility = 1 dragger_visibility = 1
[node name="VBoxContainer" type="VBoxContainer" parent="Panel/MarginContainer/HSplitContainer"] [node name="VBoxContainer" type="VBoxContainer" parent="Panel/MarginContainer/HSplitContainer"]
margin_right = 88.0 offset_right = 88.0
margin_bottom = 126.0 offset_bottom = 126.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_stretch_ratio = 0.3 size_flags_stretch_ratio = 0.3
[node name="avatar" type="TextureRect" parent="Panel/MarginContainer/HSplitContainer/VBoxContainer"] [node name="avatar" type="TextureRect" parent="Panel/MarginContainer/HSplitContainer/VBoxContainer"]
margin_right = 88.0 offset_right = 88.0
margin_bottom = 108.0 offset_bottom = 108.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
expand = true expand = true
[node name="text" type="RichTextLabel" parent="Panel/MarginContainer/HSplitContainer"] [node name="text" type="RichTextLabel" parent="Panel/MarginContainer/HSplitContainer"]
margin_left = 123.0 offset_left = 123.0
margin_right = 458.0 offset_right = 458.0
margin_bottom = 126.0 offset_bottom = 126.0
size_flags_horizontal = 3 size_flags_horizontal = 3
bbcode_enabled = true bbcode_enabled = true
bbcode_text = "Here be some text" text = "Here be some text"
text = "Here be some text" text = "Here be some text"
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false

View File

@@ -34,13 +34,13 @@ var _current_line: String
# Tween node for text animation # Tween node for text animation
onready var tween: Tween = $Tween @onready var tween: Tween = $Tween
# The node showing the text # The node showing the text
onready var text_node: RichTextLabel = self @onready var text_node: RichTextLabel = self
# Whether the dialog manager is paused # Whether the dialog manager is paused
onready var is_paused: bool = true @onready var is_paused: bool = true
# Enable bbcode and catch the signal when a tween completed # Enable bbcode and catch the signal when a tween completed
@@ -96,12 +96,12 @@ func _ready():
_word_regex.compile("\\S+") _word_regex.compile("\\S+")
bbcode_enabled = true bbcode_enabled = true
$Tween.connect("tween_completed", self, "_on_dialog_line_typed") $Tween.connect("tween_completed", Callable(self, "_on_dialog_line_typed"))
connect("tree_exiting", self, "_on_tree_exiting") connect("tree_exiting", Callable(self, "_on_tree_exiting"))
escoria.connect("paused", self, "_on_paused") escoria.connect("paused", Callable(self, "_on_paused"))
escoria.connect("resumed", self, "_on_resumed") escoria.connect("resumed", Callable(self, "_on_resumed"))
_current_line = "" _current_line = ""
@@ -110,18 +110,18 @@ func _process(delta):
if _current_character.is_inside_tree() and \ if _current_character.is_inside_tree() and \
_current_character.has_node("dialog_position"): _current_character.has_node("dialog_position"):
# Position the RichTextLabel on the character's dialog position, if any. # Position the RichTextLabel on the character's dialog position, if any.
rect_position = _current_character.get_node("dialog_position") \ position = _current_character.get_node("dialog_position") \
.get_global_transform_with_canvas().origin super.get_global_transform_with_canvas().origin
rect_position.x -= rect_size.x / 2 position.x -= size.x / 2
if rect_position.x < 0: if position.x < 0:
rect_position.x = 0 position.x = 0
var screen_margin = rect_position.x + rect_size.x - \ var screen_margin = position.x + size.x - \
ProjectSettings.get("display/window/size/width") ProjectSettings.get("display/window/size/viewport_width")
if screen_margin > 0: if screen_margin > 0:
rect_position.x -= screen_margin position.x -= screen_margin
# Make a character say something # Make a character say something
@@ -143,27 +143,27 @@ func say(character: String, line: String) :
var text_color = _current_character.dialog_color var text_color = _current_character.dialog_color
var text_color_html = text_color.to_html(false) var text_color_html = text_color.to_html(false)
text_node.bbcode_text = "[center][color=#" + text_color_html + "]" \ text_node.text = "[center][color=#" + text_color_html + "]" \
.format([text_color_html]) + tr(line) + "[/color][center]" super.format([text_color_html]) + tr(line) + "[/color][center]"
if _current_character.is_inside_tree() and \ if _current_character.is_inside_tree() and \
_current_character.has_node("dialog_position"): _current_character.has_node("dialog_position"):
rect_position = _current_character.get_node( position = _current_character.get_node(
"dialog_position" "dialog_position"
).get_global_transform_with_canvas().origin ).get_global_transform_with_canvas().origin
rect_position.x -= rect_size.x / 2 position.x -= size.x / 2
else: else:
rect_position.x = 0 position.x = 0
rect_size.x = ProjectSettings.get_setting("display/window/size/width") size.x = ProjectSettings.get_setting("display/window/size/viewport_width")
if rect_position.x < 0: if position.x < 0:
rect_position.x = 0 position.x = 0
var screen_margin = rect_position.x + rect_size.x - \ var screen_margin = position.x + size.x - \
ProjectSettings.get("display/window/size/width") ProjectSettings.get("display/window/size/viewport_width")
if screen_margin > 0: if screen_margin > 0:
rect_position.x -= screen_margin position.x -= screen_margin
_current_character.start_talking() _current_character.start_talking()
@@ -211,7 +211,7 @@ func _on_dialog_line_typed(object, key):
var time_to_disappear: float = _calculate_time_to_disappear() var time_to_disappear: float = _calculate_time_to_disappear()
$Timer.start(time_to_disappear) $Timer.start(time_to_disappear)
$Timer.connect("timeout", self, "_on_dialog_finished") $Timer.connect("timeout", Callable(self, "_on_dialog_finished"))
emit_signal("say_visible") emit_signal("say_visible")

View File

@@ -4,11 +4,11 @@
[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" type="Theme" id=2] [ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" type="Theme" id=2]
[node name="dialog_label" type="RichTextLabel"] [node name="dialog_label" type="RichTextLabel"]
margin_right = 672.0 offset_right = 672.0
margin_bottom = 97.0 offset_bottom = 97.0
theme = ExtResource( 2 ) theme = ExtResource( 2 )
bbcode_enabled = true bbcode_enabled = true
bbcode_text = "[center]Here be some text.[/center]" text = "[center]Here be some text.[/center]"
text = "Here be some text." text = "Here be some text."
fit_content_height = true fit_content_height = true
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@@ -1,10 +1,10 @@
extends TextureButton extends TextureButton
export(Texture) var musicEnabledTexture: Texture @export var musicEnabledTexture: Texture2D
export(Texture) var musicEnabledHoverTexture: Texture @export var musicEnabledHoverTexture: Texture2D
export(Texture) var musicDisabledTexture: Texture @export var musicDisabledTexture: Texture2D
export(Texture) var musicDisabledHoverTexture: Texture @export var musicDisabledHoverTexture: Texture2D
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready(): func _ready():

View File

@@ -29,7 +29,7 @@ func validate(arguments: Array):
# ) # )
# return false # return false
return .validate(arguments) return super.validate(arguments)
# Run the command # Run the command

View File

@@ -16,14 +16,14 @@ func configure() -> ESCCommandArgumentDescriptor:
# Validate wether the given arguments match the command descriptor # Validate wether the given arguments match the command descriptor
func validate(arguments: Array): func validate(arguments: Array):
return .validate(arguments) return super.validate(arguments)
# Run the command # Run the command
func run(command_params: Array) -> int: func run(command_params: Array) -> int:
AudioServer.set_bus_volume_db( AudioServer.set_bus_volume_db(
AudioServer.get_bus_index(escoria.BUS_MUSIC), AudioServer.get_bus_index(escoria.BUS_MUSIC),
linear2db( linear_to_db(
ESCProjectSettingsManager.get_setting( ESCProjectSettingsManager.get_setting(
ESCProjectSettingsManager.MUSIC_VOLUME ESCProjectSettingsManager.MUSIC_VOLUME
) )

View File

@@ -23,7 +23,7 @@ func configure() -> ESCCommandArgumentDescriptor:
# Validate whether the given arguments match the command descriptor # Validate whether the given arguments match the command descriptor
func validate(arguments: Array): func validate(arguments: Array):
if not .validate(arguments): if not super.validate(arguments):
return false return false
var subFolder = arguments[1] var subFolder = arguments[1]

View File

@@ -20,7 +20,7 @@ func configure() -> ESCCommandArgumentDescriptor:
# Validate whether the given arguments match the command descriptor # Validate whether the given arguments match the command descriptor
func validate(arguments: Array): func validate(arguments: Array):
if not .validate(arguments): if not super.validate(arguments):
return false return false
if not ResourceLoader.exists(arguments[0]): if not ResourceLoader.exists(arguments[0]):
@@ -37,6 +37,6 @@ func validate(arguments: Array):
func run(command_params: Array) -> int: func run(command_params: Array) -> int:
escoria.game_scene.play_video(command_params[0]) escoria.game_scene.play_video(command_params[0])
#We wait for the video to emit "finished" signal with yield #We wait for the video to emit "finished" signal with yield
yield(escoria.game_scene.get_video_player(),"finished") await escoria.game_scene.get_video_player().finished
escoria.game_scene.open_inventory() escoria.game_scene.open_inventory()
return ESCExecution.RC_OK return ESCExecution.RC_OK

View File

@@ -24,7 +24,7 @@ func configure() -> ESCCommandArgumentDescriptor:
# Validate whether the given arguments match the command descriptor # Validate whether the given arguments match the command descriptor
func validate(arguments: Array): func validate(arguments: Array):
if not .validate(arguments): if not super.validate(arguments):
return false return false
if not escoria.object_manager.has(arguments[0]): if not escoria.object_manager.has(arguments[0]):

View File

@@ -248,7 +248,7 @@ func perform_inputevent_on_object(
) )
if context is GDScriptFunctionState: if context is GDScriptFunctionState:
context = yield(context, "completed") context = await context.completed
# In case of an interrupted walk, we don't want to proceed. # In case of an interrupted walk, we don't want to proceed.
if context == null: if context == null:

View File

@@ -60,18 +60,18 @@ func get_item(global_id: String) -> ESCItem:
func updateSprite(item: ESCItem) -> void: func updateSprite(item: ESCItem) -> void:
var child_node = item.get_node("Sprite") as Sprite var child_node = item.get_node("Sprite2D") as Sprite2D
if not child_node is Sprite: if not child_node is Sprite2D:
escoria.logger.error( escoria.logger.error(
self, self,
"No Sprite node found" "No Sprite2D node found"
) )
var texture_path = getCountTexturePath(item) var texture_path = getCountTexturePath(item)
var texture = load(texture_path) var texture = load(texture_path)
# Update texture in scene # Update texture in scene
var sprite = child_node as Sprite var sprite = child_node as Sprite2D
sprite.texture = texture sprite.texture = texture
# Update texture in scene # Update texture in scene

View File

@@ -1,15 +1,15 @@
tool @tool
extends ESCItem extends ESCItem
class_name ESCItemWithTooltip, "res://addons/escoria-core/design/esc_item.svg" class_name ESCItemWithTooltip, "res://addons/escoria-core/design/esc_item.svg"
# Action 3 tooltip texts if item is target. Dictionary with tool's global id as key. # Action 3 tooltip texts if item is target. Dictionary with tool's global id as key.
export(Dictionary) var action3_target_texts = {} @export var action3_target_texts: Dictionary = {}
# Action 4 tooltip texts if item is target. Dictionary with tool's global id as key # Action 4 tooltip texts if item is target. Dictionary with tool's global id as key
export(Dictionary) var action4_target_texts = {} @export var action4_target_texts: Dictionary = {}
# If action used by player is in this list, this is a valid target (second item in combination) # If action used by player is in this list, this is a valid target (second item in combination)
export(Array) var target_when_selected_action_is_in = [] @export var target_when_selected_action_is_in: Array = []
# ESCItemComponents children of this node # ESCItemComponents children of this node
var components: Dictionary = {} var components: Dictionary = {}
@@ -44,6 +44,6 @@ func autoload_components():
func set_custom_data(data: Dictionary) -> void: func set_custom_data(data: Dictionary) -> void:
.set_custom_data(data) super.set_custom_data(data)
if custom_data.has("count"): if custom_data.has("count"):
ESCItemCountManager.new().updateSprite(self) ESCItemCountManager.new().updateSprite(self)

View File

@@ -1,14 +1,14 @@
tool @tool
extends ESCItemWithTooltip extends ESCItemWithTooltip
class_name ESCPlayerWithTooltip, "res://addons/escoria-core/design/esc_player.svg" class_name ESCPlayerWithTooltip, "res://addons/escoria-core/design/esc_player.svg"
# Whether the player can be selected like an item # Whether the player can be selected like an item
export(bool) var selectable = false @export var selectable: bool = false
# A player is always movable # A player is always movable
func _init(): func _init():
._init() super._init()
is_movable = true is_movable = true
_force_registration = true _force_registration = true
@@ -17,7 +17,7 @@ func _init():
# Ready function # Ready function
func _ready(): func _ready():
if selectable: if selectable:
._ready() super._ready()
else: else:
tooltip_name = "" tooltip_name = ""

View File

@@ -1,5 +1,5 @@
@tool
# A tooltip displaying <verb> <item1> [<item2>] # A tooltip displaying <verb> <item1> [<item2>]
tool
extends Node2D extends Node2D
class_name ESCRichTooltip class_name ESCRichTooltip
@@ -18,27 +18,27 @@ const ONE_LINE_HEIGHT = 16
# Color of the label # Color of the label
export(Color) var color setget set_color @export var color: Color: set = set_color
# Vector2 defining the offset from the cursor # Vector2 defining the offset from the cursor
export(Vector2) var offset_from_cursor_action1 = Vector2(0,3) @export var offset_from_cursor_action1: Vector2 = Vector2(0,3)
export(Vector2) var offset_from_cursor_action2 = Vector2(0,-2) @export var offset_from_cursor_action2: Vector2 = Vector2(0,-2)
export(Vector2) var offset_from_cursor_action3 = Vector2(0,3) @export var offset_from_cursor_action3: Vector2 = Vector2(0,3)
export(Vector2) var offset_from_cursor_action4 = Vector2(0,-2) @export var offset_from_cursor_action4: Vector2 = Vector2(0,-2)
# Activates debug mode. If enabled, shows the label with a white background. # Activates debug mode. If enabled, shows the label with a white background.
export(bool) var debug_mode = false setget set_debug_mode @export var debug_mode: bool = false: set = set_debug_mode
# Infinitive verb # Infinitive verb
var current_action: String var current_action: String
# Target item/hotspot # Target item/hotspot
var current_target: String setget set_target var current_target: String: set = set_target
var current_target_object: Object = null setget set_target_object var current_target_object: Object = null: set = set_target_object
# Preposition: on, with... # Preposition: on, with...
var current_prep: String = "with" var current_prep: String = "with"
@@ -46,7 +46,7 @@ var current_prep: String = "with"
# Target 2 item/hotspot # Target 2 item/hotspot
var current_target2: String var current_target2: String
var current_size: Vector2 = Vector2(0,0) setget _set_current_size var current_size: Vector2 = Vector2(0,0): set = _set_current_size
# True if tooltip is waiting for a click on second target (use x with y) # True if tooltip is waiting for a click on second target (use x with y)
var waiting_for_target2 = false var waiting_for_target2 = false
@@ -64,10 +64,10 @@ signal tooltip_size_updated
# Connect relevant functions # Connect relevant functions
func _ready(): func _ready():
if escoria.main.connect("room_ready", self, "_on_room_ready") != 0: if escoria.main.connect("room_ready", Callable(self, "_on_room_ready")) != 0:
escoria.logger.error(self, "Error connecting room_ready with _on_room_ready") escoria.logger.error(self, "Error connecting room_ready with _on_room_ready")
if escoria.action_manager.connect("action_changed", self, "_on_action_selected") != 0: if escoria.action_manager.connect("action_changed", Callable(self, "_on_action_selected")) != 0:
escoria.logger.error(self, "Error connecting action_changed with _on_action_selected") escoria.logger.error(self, "Error connecting action_changed with _on_action_selected")

View File

@@ -1,8 +1,8 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd" type="Script" id=1]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_right.png" type="Texture" id=2] [ext_resource path="res://addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_right.png" type="Texture2D" id=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_left.png" type="Texture" id=3] [ext_resource path="res://addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_left.png" type="Texture2D" id=3]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/theme.tres" type="Theme" id=4] [ext_resource path="res://addons/escoria-ui-return-monkey-island/theme.tres" type="Theme" id=4]
[node name="tooltipManager" type="Node2D"] [node name="tooltipManager" type="Node2D"]
@@ -12,14 +12,14 @@ script = ExtResource( 1 )
visible = false visible = false
[node name="label" type="Label" parent="tooltip1"] [node name="label" type="Label" parent="tooltip1"]
margin_left = 9.0 offset_left = 9.0
margin_top = -6.0 offset_top = -6.0
margin_right = 119.0 offset_right = 119.0
margin_bottom = 8.0 offset_bottom = 8.0
theme = ExtResource( 4 ) theme = ExtResource( 4 )
text = "Text place holder" text = "Text place holder"
[node name="icon" type="Sprite" parent="tooltip1"] [node name="icon" type="Sprite2D" parent="tooltip1"]
position = Vector2( 1, 8 ) position = Vector2( 1, 8 )
scale = Vector2( 0.583333, 0.583333 ) scale = Vector2( 0.583333, 0.583333 )
texture = ExtResource( 3 ) texture = ExtResource( 3 )
@@ -28,14 +28,14 @@ texture = ExtResource( 3 )
visible = false visible = false
[node name="label" type="Label" parent="tooltip2"] [node name="label" type="Label" parent="tooltip2"]
margin_left = 9.0 offset_left = 9.0
margin_top = 35.0 offset_top = 35.0
margin_right = 144.0 offset_right = 144.0
margin_bottom = 64.0 offset_bottom = 64.0
theme = ExtResource( 4 ) theme = ExtResource( 4 )
text = "Text place holder" text = "Text place holder"
[node name="icon" type="Sprite" parent="tooltip2"] [node name="icon" type="Sprite2D" parent="tooltip2"]
position = Vector2( 1, 49.5 ) position = Vector2( 1, 49.5 )
scale = Vector2( 0.583333, 0.583333 ) scale = Vector2( 0.583333, 0.583333 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )

View File

@@ -1,6 +1,6 @@
[gd_resource type="DynamicFont" load_steps=2 format=2] [gd_resource type="FontFile" load_steps=2 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.ttf" type="DynamicFontData" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.ttf" type="FontFile" id=1]
[resource] [resource]
size = 21 size = 21

View File

@@ -1,6 +1,6 @@
[gd_resource type="DynamicFont" load_steps=2 format=2] [gd_resource type="FontFile" load_steps=2 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.ttf" type="DynamicFontData" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.ttf" type="FontFile" id=1]
[resource] [resource]
font_data = ExtResource( 1 ) font_data = ExtResource( 1 )

View File

@@ -93,17 +93,17 @@ func _ready():
# We need a slightly modified version of Action Manager to combine items with different actions. # We need a slightly modified version of Action Manager to combine items with different actions.
escoria.action_manager = ESCActionManagerMonkey.new() escoria.action_manager = ESCActionManagerMonkey.new()
if $tooltip_layer/tooltip.connect("tooltip_size_updated", self, "update_tooltip_following_mouse_position", [tooltip_node]) != 0: if $tooltip_layer/tooltip.connect("tooltip_size_updated", Callable(self, "update_tooltip_following_mouse_position").bind(tooltip_node)) != 0:
escoria.logger.error(self, "Error connecting tooltip_size_updated with update_tooltip_following_mouse_position") escoria.logger.error(self, "Error connecting tooltip_size_updated with update_tooltip_following_mouse_position")
# We get current day and month # We get current day and month
var time = OS.get_datetime() var time = Time.get_datetime_dict_from_system()
var day = time["day"] var day = time["day"]
var month = time["month"] var month = time["month"]
if( day == 8 and month ==2 ): if( day == 8 and month ==2 ):
escoria.globals_manager.set_global('zorionak_eneko', true) escoria.globals_manager.set_global('zorionak_eneko', true)
# Show inventory when video player finishes playing a video (inventory is hidden when a video starts) # Show inventory when video player finishes playing a video (inventory is hidden when a video starts)
get_video_player().connect("finished", self, "show_ui") get_video_player().connect("finished", Callable(self, "show_ui"))
@@ -117,7 +117,7 @@ func _enter_tree():
preload( preload(
"res://addons/escoria-core/ui_library/tools/room_select" +\ "res://addons/escoria-core/ui_library/tools/room_select" +\
"/room_select.tscn" "/room_select.tscn"
).instance() ).instantiate()
) )
var room_selector = room_selector_parent.get_node_or_null("room_select") var room_selector = room_selector_parent.get_node_or_null("room_select")
if(room_selector != null): if(room_selector != null):
@@ -131,13 +131,13 @@ func _enter_tree():
if _is_gamepad_connected: if _is_gamepad_connected:
_on_gamepad_connected() _on_gamepad_connected()
if Input.connect("joy_connection_changed", self, "_on_joy_connection_changed") != 0: if Input.connect("joy_connection_changed", Callable(self, "_on_joy_connection_changed")) != 0:
escoria.logger.error(self, "Error connecting joy_connection_changed") escoria.logger.error(self, "Error connecting joy_connection_changed")
func _exit_tree(): func _exit_tree():
escoria.inputs_manager.register_custom_input_handler(null) escoria.inputs_manager.register_custom_input_handler(null)
Input.disconnect("joy_connection_changed", self, "_on_joy_connection_changed") Input.disconnect("joy_connection_changed", Callable(self, "_on_joy_connection_changed"))
if _is_gamepad_connected: if _is_gamepad_connected:
_on_gamepad_disconnected() _on_gamepad_disconnected()
@@ -511,13 +511,13 @@ func _on_MusicButton_pressed():
if musicEnabled: if musicEnabled:
AudioServer.set_bus_volume_db( AudioServer.set_bus_volume_db(
AudioServer.get_bus_index(escoria.BUS_MUSIC), AudioServer.get_bus_index(escoria.BUS_MUSIC),
linear2db(0) linear_to_db(0)
) )
musicEnabled = false musicEnabled = false
else: else:
AudioServer.set_bus_volume_db( AudioServer.set_bus_volume_db(
AudioServer.get_bus_index(escoria.BUS_MUSIC), AudioServer.get_bus_index(escoria.BUS_MUSIC),
linear2db( linear_to_db(
ESCProjectSettingsManager.get_setting( ESCProjectSettingsManager.get_setting(
ESCProjectSettingsManager.MUSIC_VOLUME ESCProjectSettingsManager.MUSIC_VOLUME
) )

View File

@@ -5,17 +5,17 @@
[ext_resource path="res://addons/escoria-core/game/scenes/camera_player/camera.tscn" type="PackedScene" id=3] [ext_resource path="res://addons/escoria-core/game/scenes/camera_player/camera.tscn" type="PackedScene" id=3]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn" type="PackedScene" id=4] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/game.gd" type="Script" id=5] [ext_resource path="res://addons/escoria-ui-return-monkey-island/game.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note.svg" type="Texture" id=6] [ext_resource path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note.svg" type="Texture2D" id=6]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn" type="PackedScene" id=7] [ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn" type="PackedScene" id=7]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn" type="PackedScene" id=8] [ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn" type="PackedScene" id=8]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/theme.tres" type="Theme" id=9] [ext_resource path="res://addons/escoria-ui-return-monkey-island/theme.tres" type="Theme" id=9]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg" type="Texture" id=10] [ext_resource path="res://addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg" type="Texture2D" id=10]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/icons/cog-64.svg" type="Texture" id=11] [ext_resource path="res://addons/escoria-ui-return-monkey-island/icons/cog-64.svg" type="Texture2D" id=11]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/video_player/video_player.tscn" type="PackedScene" id=12] [ext_resource path="res://addons/escoria-ui-return-monkey-island/video_player/video_player.tscn" type="PackedScene" id=12]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg" type="Texture" id=13] [ext_resource path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg" type="Texture2D" id=13]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/MusicButton.gd" type="Script" id=14] [ext_resource path="res://addons/escoria-ui-return-monkey-island/MusicButton.gd" type="Script" id=14]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg" type="Texture" id=15] [ext_resource path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg" type="Texture2D" id=15]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg" type="Texture" id=16] [ext_resource path="res://addons/escoria-ui-return-monkey-island/icons/music-double-note-disabled.svg" type="Texture2D" id=16]
[node name="game" type="Node2D"] [node name="game" type="Node2D"]
script = ExtResource( 5 ) script = ExtResource( 5 )
@@ -51,30 +51,30 @@ script = ExtResource( 2 )
anchor_top = 0.9 anchor_top = 0.9
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
margin_top = -26.0 offset_top = -26.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
theme = ExtResource( 9 ) theme = ExtResource( 9 )
[node name="menu_button" type="Control" parent="CanvasLayer/ui"] [node name="menu_button" type="Control" parent="CanvasLayer/ui"]
margin_left = 1245.0 offset_left = 1245.0
margin_top = -643.0 offset_top = -643.0
margin_right = 1245.0 offset_right = 1245.0
margin_bottom = -643.0 offset_bottom = -643.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
[node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/ui/menu_button"] [node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/ui/menu_button"]
margin_left = -135.0 offset_left = -135.0
margin_top = 6.0 offset_top = 6.0
margin_right = 21.0 offset_right = 21.0
margin_bottom = 76.0 offset_bottom = 76.0
alignment = 1 alignment = 1
[node name="MusicButton" type="TextureButton" parent="CanvasLayer/ui/menu_button/HBoxContainer"] [node name="MusicButton" type="TextureButton" parent="CanvasLayer/ui/menu_button/HBoxContainer"]
margin_left = 44.0 offset_left = 44.0
margin_right = 44.0 offset_right = 44.0
margin_bottom = 70.0 offset_bottom = 70.0
script = ExtResource( 14 ) script = ExtResource( 14 )
musicEnabledTexture = ExtResource( 6 ) musicEnabledTexture = ExtResource( 6 )
musicEnabledHoverTexture = ExtResource( 13 ) musicEnabledHoverTexture = ExtResource( 13 )
@@ -82,31 +82,31 @@ musicDisabledTexture = ExtResource( 16 )
musicDisabledHoverTexture = ExtResource( 15 ) musicDisabledHoverTexture = ExtResource( 15 )
[node name="MenuButton" type="TextureButton" parent="CanvasLayer/ui/menu_button/HBoxContainer"] [node name="MenuButton" type="TextureButton" parent="CanvasLayer/ui/menu_button/HBoxContainer"]
margin_left = 48.0 offset_left = 48.0
margin_right = 112.0 offset_right = 112.0
margin_bottom = 70.0 offset_bottom = 70.0
texture_normal = ExtResource( 11 ) texture_normal = ExtResource( 11 )
texture_hover = ExtResource( 10 ) texture_hover = ExtResource( 10 )
[node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/ui"] [node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/ui"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
margin_top = 18.0 offset_top = 18.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
[node name="Spacer" type="Control" parent="CanvasLayer/ui/HBoxContainer"] [node name="Spacer" type="Control" parent="CanvasLayer/ui/HBoxContainer"]
margin_right = 1186.0 offset_right = 1186.0
margin_bottom = 90.0 offset_bottom = 90.0
size_flags_horizontal = 3 size_flags_horizontal = 3
[node name="inventory_ui" parent="CanvasLayer/ui/HBoxContainer" instance=ExtResource( 1 )] [node name="inventory_ui" parent="CanvasLayer/ui/HBoxContainer" instance=ExtResource( 1 )]
anchor_right = 0.0 anchor_right = 0.0
anchor_bottom = 0.0 anchor_bottom = 0.0
margin_left = 1190.0 offset_left = 1190.0
margin_right = 1280.0 offset_right = 1280.0
margin_bottom = 90.0 offset_bottom = 90.0
rect_scale = Vector2( 1, 1 ) scale = Vector2( 1, 1 )
[node name="pause_menu" parent="CanvasLayer" instance=ExtResource( 8 )] [node name="pause_menu" parent="CanvasLayer" instance=ExtResource( 8 )]
visible = false visible = false

View File

@@ -6,7 +6,7 @@ var inventory_visible: bool = false
func _ready() -> void: func _ready() -> void:
$FloatingInventory/panel.rect_position.x = ProjectSettings.get_setting("display/window/size/width") - $FloatingInventory/panel.rect_size.x $FloatingInventory/panel.position.x = ProjectSettings.get_setting("display/window/size/viewport_width") - $FloatingInventory/panel.size.x
func show_inventory(): func show_inventory():

View File

@@ -6,10 +6,10 @@
[node name="inventory_ui" type="Control"] [node name="inventory_ui" type="Control"]
anchor_right = 0.5 anchor_right = 0.5
anchor_bottom = 0.5 anchor_bottom = 0.5
margin_right = 768.0 offset_right = 768.0
margin_bottom = 540.0 offset_bottom = 540.0
rect_min_size = Vector2( 90, 90 ) custom_minimum_size = Vector2( 90, 90 )
rect_scale = Vector2( 0.4, 0.4 ) scale = Vector2( 0.4, 0.4 )
size_flags_horizontal = 0 size_flags_horizontal = 0
size_flags_vertical = 3 size_flags_vertical = 3
script = ExtResource( 1 ) script = ExtResource( 1 )
@@ -22,16 +22,16 @@ inventory_ui_container = NodePath("FloatingInventory/panel/MarginContainer/Scrol
[node name="inventory_bg" type="Polygon2D" parent="FloatingInventory"] [node name="inventory_bg" type="Polygon2D" parent="FloatingInventory"]
color = Color( 0.156863, 0.0627451, 0, 1 ) color = Color( 0.156863, 0.0627451, 0, 1 )
polygon = PoolVector2Array( -3, 578, 1280, 578, 1280, 752, -3, 757 ) polygon = PackedVector2Array( -3, 578, 1280, 578, 1280, 752, -3, 757 )
[node name="panel" type="TextureRect" parent="FloatingInventory"] [node name="panel" type="TextureRect" parent="FloatingInventory"]
anchor_left = 1.0 anchor_left = 1.0
anchor_top = 1.0 anchor_top = 1.0
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
margin_left = -1276.0 offset_left = -1276.0
margin_top = -160.0 offset_top = -160.0
rect_min_size = Vector2( 0, 160 ) custom_minimum_size = Vector2( 0, 160 )
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
expand = true expand = true
@@ -39,30 +39,30 @@ expand = true
[node name="MarginContainer" type="MarginContainer" parent="FloatingInventory/panel"] [node name="MarginContainer" type="MarginContainer" parent="FloatingInventory/panel"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
margin_left = -4.0 offset_left = -4.0
margin_top = 2.0 offset_top = 2.0
margin_right = -16.0 offset_right = -16.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
custom_constants/margin_right = 20 theme_override_constants/margin_right = 20
custom_constants/margin_top = 20 theme_override_constants/margin_top = 20
custom_constants/margin_left = 20 theme_override_constants/margin_left = 20
custom_constants/margin_bottom = 20 theme_override_constants/margin_bottom = 20
[node name="ScrollContainer" type="ScrollContainer" parent="FloatingInventory/panel/MarginContainer"] [node name="ScrollContainer" type="ScrollContainer" parent="FloatingInventory/panel/MarginContainer"]
margin_left = 20.0 offset_left = 20.0
margin_top = 79.0 offset_top = 79.0
margin_right = 1244.0 offset_right = 1244.0
margin_bottom = 79.0 offset_bottom = 79.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 6 size_flags_vertical = 6
scroll_vertical_enabled = false scroll_vertical_enabled = false
[node name="container" type="HBoxContainer" parent="FloatingInventory/panel/MarginContainer/ScrollContainer"] [node name="container" type="HBoxContainer" parent="FloatingInventory/panel/MarginContainer/ScrollContainer"]
margin_right = 1224.0 offset_right = 1224.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
custom_constants/separation = 20 theme_override_constants/separation = 20
script = ExtResource( 3 ) script = ExtResource( 3 )
[node name="InventoryTween" type="Tween" parent="FloatingInventory"] [node name="InventoryTween" type="Tween" parent="FloatingInventory"]

View File

@@ -1,9 +1,9 @@
tool @tool
extends Polygon2D extends Polygon2D
class_name ItemOutline, "res://addons/escoria-core/design/esc_item.svg" class_name ItemOutline, "res://addons/escoria-core/design/esc_item.svg"
export(Color) var OutLine = Color(0,0,0) setget set_outline_color @export var OutLine: Color = Color(0,0,0): set = set_outline_color
export(float) var Width = 2.0 setget set_outline_width @export var Width: float = 2.0: set = set_outline_width
func _draw(): func _draw():
var poly = get_polygon() var poly = get_polygon()

View File

@@ -2,7 +2,7 @@
[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.gd" type="Script" id=1]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd" type="Script" id=2] [ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd" type="Script" id=2]
[ext_resource path="res://gymkhana/logo-small.png" type="Texture" id=3] [ext_resource path="res://gymkhana/logo-small.png" type="Texture2D" id=3]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" type="PackedScene" id=4] [ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn" type="PackedScene" id=5] [ext_resource path="res://addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn" type="PackedScene" id=5]
@@ -33,36 +33,36 @@ __meta__ = {
anchor_left = 0.5 anchor_left = 0.5
anchor_right = 0.5 anchor_right = 0.5
anchor_bottom = 1.0 anchor_bottom = 1.0
margin_left = -308.0 offset_left = -308.0
margin_right = 308.0 offset_right = 308.0
custom_constants/separation = 100 theme_override_constants/separation = 100
alignment = 1 alignment = 1
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="TextureRect" type="TextureRect" parent="main/main"] [node name="TextureRect" type="TextureRect" parent="main/main"]
margin_top = 55.0 offset_top = 55.0
margin_right = 616.0 offset_right = 616.0
margin_bottom = 355.0 offset_bottom = 355.0
texture = ExtResource( 3 ) texture = ExtResource( 3 )
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="buttons" type="VBoxContainer" parent="main/main"] [node name="buttons" type="VBoxContainer" parent="main/main"]
margin_top = 455.0 offset_top = 455.0
margin_right = 616.0 offset_right = 616.0
margin_bottom = 695.0 offset_bottom = 695.0
custom_constants/separation = 10 theme_override_constants/separation = 10
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="new_game" type="Button" parent="main/main/buttons"] [node name="new_game" type="Button" parent="main/main/buttons"]
margin_right = 616.0 offset_right = 616.0
margin_bottom = 150.0 offset_bottom = 150.0
rect_min_size = Vector2( 0, 150 ) custom_minimum_size = Vector2( 0, 150 )
size_flags_vertical = 3 size_flags_vertical = 3
text = "NEW_GAME" text = "NEW_GAME"
__meta__ = { __meta__ = {
@@ -70,9 +70,9 @@ __meta__ = {
} }
[node name="load_game" type="Button" parent="main/main/buttons"] [node name="load_game" type="Button" parent="main/main/buttons"]
margin_top = 160.0 offset_top = 160.0
margin_right = 616.0 offset_right = 616.0
margin_bottom = 180.0 offset_bottom = 180.0
text = "LOAD_GAME" text = "LOAD_GAME"
script = ExtResource( 2 ) script = ExtResource( 2 )
__meta__ = { __meta__ = {
@@ -80,15 +80,15 @@ __meta__ = {
} }
[node name="options" type="Button" parent="main/main/buttons"] [node name="options" type="Button" parent="main/main/buttons"]
margin_top = 190.0 offset_top = 190.0
margin_right = 616.0 offset_right = 616.0
margin_bottom = 210.0 offset_bottom = 210.0
text = "OPTIONS" text = "OPTIONS"
[node name="quit" type="Button" parent="main/main/buttons"] [node name="quit" type="Button" parent="main/main/buttons"]
margin_top = 220.0 offset_top = 220.0
margin_right = 616.0 offset_right = 616.0
margin_bottom = 240.0 offset_bottom = 240.0
text = "QUIT" text = "QUIT"
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false

View File

@@ -19,7 +19,7 @@ var _loaded_languages: Array = []
# The settings changed # The settings changed
onready var settings_changed = false @onready var changed = false
# Initialize the flags # Initialize the flags
@@ -41,7 +41,7 @@ func _ready() -> void:
"/menus/options/flags/%s.png" % lang "/menus/options/flags/%s.png" % lang
) )
_flags_container.add_child(_lang) _flags_container.add_child(_lang)
_lang.connect("gui_input", self, "_on_language_input", [lang]) _lang.connect("gui_input", Callable(self, "_on_language_input").bind(lang))
# Show the options # Show the options
@@ -78,7 +78,7 @@ func _on_language_input(event: InputEvent, language: String):
ESCProjectSettingsManager.TEXT_LANG, ESCProjectSettingsManager.TEXT_LANG,
language language
) )
settings_changed = true changed = true
# Sound volume was changed # Sound volume was changed
@@ -94,7 +94,7 @@ func _on_sound_volume_changed(value):
value value
) )
escoria.settings_manager.apply_settings() escoria.settings_manager.apply_settings()
settings_changed = true changed = true
# Music volume was changed # Music volume was changed
@@ -110,7 +110,7 @@ func _on_music_volume_changed(value):
value value
) )
escoria.settings_manager.apply_settings() escoria.settings_manager.apply_settings()
settings_changed = true changed = true
# General volume was changed # General volume was changed
@@ -126,7 +126,7 @@ func _on_general_volume_changed(value):
value value
) )
escoria.settings_manager.apply_settings() escoria.settings_manager.apply_settings()
settings_changed = true changed = true
# Speech volume was changed # Speech volume was changed
@@ -142,7 +142,7 @@ func _on_speech_volume_value_changed(value: float) -> void:
value value
) )
escoria.settings_manager.apply_settings() escoria.settings_manager.apply_settings()
settings_changed = true changed = true
# Fullscreen was changed # Fullscreen was changed
@@ -158,7 +158,7 @@ func _on_fullscreen_toggled(button_pressed: bool) -> void:
button_pressed button_pressed
) )
escoria.settings_manager.apply_settings() escoria.settings_manager.apply_settings()
settings_changed = true changed = true
# Save the settings # Save the settings
@@ -167,7 +167,7 @@ func _on_apply_pressed():
RTMISimpleDialogSettings.READING_SPEED_IN_WPM RTMISimpleDialogSettings.READING_SPEED_IN_WPM
) )
escoria.settings_manager.save_settings() escoria.settings_manager.save_settings()
settings_changed = false changed = false
emit_signal("back_button_pressed") emit_signal("back_button_pressed")
@@ -187,4 +187,4 @@ func _on_speech_speed_value_changed(value):
value value
) )
escoria.settings_manager.apply_settings() escoria.settings_manager.apply_settings()
settings_changed = true changed = true

View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/options/flags/de.png" type="Texture" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/options/flags/de.png" type="Texture2D" id=1]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/options/options.gd" type="Script" id=4] [ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/options/options.gd" type="Script" id=4]
[node name="options" type="Control"] [node name="options" type="Control"]
@@ -21,136 +21,136 @@ anchor_bottom = 1.0
alignment = 1 alignment = 1
[node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"] [node name="MarginContainer" type="MarginContainer" parent="VBoxContainer"]
margin_left = 391.0 offset_left = 391.0
margin_top = 241.0 offset_top = 241.0
margin_right = 888.0 offset_right = 888.0
margin_bottom = 484.0 offset_bottom = 484.0
size_flags_horizontal = 6 size_flags_horizontal = 6
custom_constants/margin_right = 20 theme_override_constants/margin_right = 20
custom_constants/margin_top = 20 theme_override_constants/margin_top = 20
custom_constants/margin_left = 20 theme_override_constants/margin_left = 20
custom_constants/margin_bottom = 20 theme_override_constants/margin_bottom = 20
[node name="options" type="GridContainer" parent="VBoxContainer/MarginContainer"] [node name="options" type="GridContainer" parent="VBoxContainer/MarginContainer"]
margin_left = 20.0 offset_left = 20.0
margin_top = 20.0 offset_top = 20.0
margin_right = 477.0 offset_right = 477.0
margin_bottom = 223.0 offset_bottom = 223.0
size_flags_vertical = 6 size_flags_vertical = 6
custom_constants/hseparation = 40 theme_override_constants/h_separation = 40
columns = 2 columns = 2
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="label" type="Label" parent="VBoxContainer/MarginContainer/options"] [node name="label" type="Label" parent="VBoxContainer/MarginContainer/options"]
margin_top = 30.0 offset_top = 30.0
margin_right = 137.0 offset_right = 137.0
margin_bottom = 44.0 offset_bottom = 44.0
text = "OPTIONS_LANGUAGE" text = "OPTIONS_LANGUAGE"
[node name="flags" type="HBoxContainer" parent="VBoxContainer/MarginContainer/options"] [node name="flags" type="HBoxContainer" parent="VBoxContainer/MarginContainer/options"]
margin_left = 177.0 offset_left = 177.0
margin_right = 457.0 offset_right = 457.0
margin_bottom = 75.0 offset_bottom = 75.0
size_flags_vertical = 3 size_flags_vertical = 3
custom_constants/separation = 30 theme_override_constants/separation = 30
alignment = 1 alignment = 1
[node name="TextureRect2" type="TextureRect" parent="VBoxContainer/MarginContainer/options/flags"] [node name="TextureRect2" type="TextureRect" parent="VBoxContainer/MarginContainer/options/flags"]
margin_right = 125.0 offset_right = 125.0
margin_bottom = 75.0 offset_bottom = 75.0
texture = ExtResource( 1 ) texture = ExtResource( 1 )
[node name="TextureRect3" type="TextureRect" parent="VBoxContainer/MarginContainer/options/flags"] [node name="TextureRect3" type="TextureRect" parent="VBoxContainer/MarginContainer/options/flags"]
margin_left = 155.0 offset_left = 155.0
margin_right = 280.0 offset_right = 280.0
margin_bottom = 75.0 offset_bottom = 75.0
texture = ExtResource( 1 ) texture = ExtResource( 1 )
[node name="label2" type="Label" parent="VBoxContainer/MarginContainer/options"] [node name="label2" type="Label" parent="VBoxContainer/MarginContainer/options"]
margin_top = 80.0 offset_top = 80.0
margin_right = 137.0 offset_right = 137.0
margin_bottom = 94.0 offset_bottom = 94.0
text = "GENERAL_VOLUME" text = "GENERAL_VOLUME"
[node name="general_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options"] [node name="general_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options"]
margin_left = 177.0 offset_left = 177.0
margin_top = 79.0 offset_top = 79.0
margin_right = 457.0 offset_right = 457.0
margin_bottom = 95.0 offset_bottom = 95.0
size_flags_horizontal = 3 size_flags_horizontal = 3
max_value = 1.0 max_value = 1.0
step = 0.001 step = 0.001
[node name="label3" type="Label" parent="VBoxContainer/MarginContainer/options"] [node name="label3" type="Label" parent="VBoxContainer/MarginContainer/options"]
margin_top = 100.0 offset_top = 100.0
margin_right = 137.0 offset_right = 137.0
margin_bottom = 114.0 offset_bottom = 114.0
text = "SOUND_VOLUME" text = "SOUND_VOLUME"
[node name="sound_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options"] [node name="sound_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options"]
margin_left = 177.0 offset_left = 177.0
margin_top = 99.0 offset_top = 99.0
margin_right = 457.0 offset_right = 457.0
margin_bottom = 115.0 offset_bottom = 115.0
size_flags_horizontal = 3 size_flags_horizontal = 3
max_value = 1.0 max_value = 1.0
step = 0.001 step = 0.001
[node name="label4" type="Label" parent="VBoxContainer/MarginContainer/options"] [node name="label4" type="Label" parent="VBoxContainer/MarginContainer/options"]
margin_top = 120.0 offset_top = 120.0
margin_right = 137.0 offset_right = 137.0
margin_bottom = 134.0 offset_bottom = 134.0
text = "MUSIC_VOLUME" text = "MUSIC_VOLUME"
[node name="music_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options"] [node name="music_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options"]
margin_left = 177.0 offset_left = 177.0
margin_top = 119.0 offset_top = 119.0
margin_right = 457.0 offset_right = 457.0
margin_bottom = 135.0 offset_bottom = 135.0
size_flags_horizontal = 3 size_flags_horizontal = 3
max_value = 1.0 max_value = 1.0
step = 0.001 step = 0.001
[node name="label5" type="Label" parent="VBoxContainer/MarginContainer/options"] [node name="label5" type="Label" parent="VBoxContainer/MarginContainer/options"]
margin_top = 140.0 offset_top = 140.0
margin_right = 137.0 offset_right = 137.0
margin_bottom = 154.0 offset_bottom = 154.0
text = "SPEECH_VOLUME" text = "SPEECH_VOLUME"
[node name="speech_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options"] [node name="speech_volume" type="HSlider" parent="VBoxContainer/MarginContainer/options"]
margin_left = 177.0 offset_left = 177.0
margin_top = 139.0 offset_top = 139.0
margin_right = 457.0 offset_right = 457.0
margin_bottom = 155.0 offset_bottom = 155.0
size_flags_horizontal = 3 size_flags_horizontal = 3
max_value = 1.0 max_value = 1.0
step = 0.001 step = 0.001
[node name="label6" type="Label" parent="VBoxContainer/MarginContainer/options"] [node name="label6" type="Label" parent="VBoxContainer/MarginContainer/options"]
margin_top = 164.0 offset_top = 164.0
margin_right = 137.0 offset_right = 137.0
margin_bottom = 178.0 offset_bottom = 178.0
text = "FULLSCREEN" text = "FULLSCREEN"
[node name="fullscreen" type="CheckBox" parent="VBoxContainer/MarginContainer/options"] [node name="fullscreen" type="CheckBox" parent="VBoxContainer/MarginContainer/options"]
margin_left = 177.0 offset_left = 177.0
margin_top = 159.0 offset_top = 159.0
margin_right = 457.0 offset_right = 457.0
margin_bottom = 183.0 offset_bottom = 183.0
[node name="label7" type="Label" parent="VBoxContainer/MarginContainer/options"] [node name="label7" type="Label" parent="VBoxContainer/MarginContainer/options"]
margin_top = 188.0 offset_top = 188.0
margin_right = 137.0 offset_right = 137.0
margin_bottom = 202.0 offset_bottom = 202.0
text = "SPEECH_SPEED" text = "SPEECH_SPEED"
[node name="speech_speed" type="HSlider" parent="VBoxContainer/MarginContainer/options"] [node name="speech_speed" type="HSlider" parent="VBoxContainer/MarginContainer/options"]
margin_left = 177.0 offset_left = 177.0
margin_top = 187.0 offset_top = 187.0
margin_right = 457.0 offset_right = 457.0
margin_bottom = 203.0 offset_bottom = 203.0
size_flags_horizontal = 3 size_flags_horizontal = 3
min_value = 10.0 min_value = 10.0
max_value = 400.0 max_value = 400.0
@@ -158,25 +158,25 @@ step = 10.0
value = 200.0 value = 200.0
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"] [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 488.0 offset_top = 488.0
margin_right = 1280.0 offset_right = 1280.0
margin_bottom = 508.0 offset_bottom = 508.0
custom_constants/separation = 20 theme_override_constants/separation = 20
alignment = 1 alignment = 1
[node name="back" type="Button" parent="VBoxContainer/HBoxContainer"] [node name="back" type="Button" parent="VBoxContainer/HBoxContainer"]
margin_left = 549.0 offset_left = 549.0
margin_right = 660.0 offset_right = 660.0
margin_bottom = 20.0 offset_bottom = 20.0
text = "OPTIONS_BACK" text = "OPTIONS_BACK"
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="apply" type="Button" parent="VBoxContainer/HBoxContainer"] [node name="apply" type="Button" parent="VBoxContainer/HBoxContainer"]
margin_left = 680.0 offset_left = 680.0
margin_right = 731.0 offset_right = 731.0
margin_bottom = 20.0 offset_bottom = 20.0
text = "APPLY" text = "APPLY"
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false

View File

@@ -9,7 +9,7 @@ func _input(event: InputEvent) -> void:
# Make the pause menu process in pause mode and hide it just to be sure # Make the pause menu process in pause mode and hide it just to be sure
func _ready(): func _ready():
self.pause_mode = Node.PAUSE_MODE_PROCESS self.process_mode = Node.PROCESS_MODE_ALWAYS
escoria.game_scene.hide_ui() escoria.game_scene.hide_ui()
hide() hide()

View File

@@ -2,7 +2,7 @@
[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd" type="Script" id=1]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" type="PackedScene" id=2] [ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/options/options.tscn" type="PackedScene" id=2]
[ext_resource path="res://gymkhana/logo-small.png" type="Texture" id=3] [ext_resource path="res://gymkhana/logo-small.png" type="Texture2D" id=3]
[ext_resource path="res://addons/escoria-core/ui_library/menus/load_save/save/save_game.tscn" type="PackedScene" id=4] [ext_resource path="res://addons/escoria-core/ui_library/menus/load_save/save/save_game.tscn" type="PackedScene" id=4]
[ext_resource path="res://addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn" type="PackedScene" id=5] [ext_resource path="res://addons/escoria-core/ui_library/menus/load_save/load/load_game.tscn" type="PackedScene" id=5]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd" type="Script" id=6] [ext_resource path="res://addons/escoria-ui-return-monkey-island/menus/savegame_feature_button.gd" type="Script" id=6]
@@ -32,33 +32,33 @@ visible = false
anchor_left = 0.5 anchor_left = 0.5
anchor_right = 0.5 anchor_right = 0.5
anchor_bottom = 1.0 anchor_bottom = 1.0
margin_left = -308.0 offset_left = -308.0
margin_right = 308.0 offset_right = 308.0
custom_constants/separation = 100 theme_override_constants/separation = 100
alignment = 1 alignment = 1
[node name="TextureRect" type="TextureRect" parent="VBoxContainer"] [node name="TextureRect" type="TextureRect" parent="VBoxContainer"]
margin_top = 25.0 offset_top = 25.0
margin_right = 616.0 offset_right = 616.0
margin_bottom = 325.0 offset_bottom = 325.0
texture = ExtResource( 3 ) texture = ExtResource( 3 )
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="menuitems" type="VBoxContainer" parent="VBoxContainer"] [node name="menuitems" type="VBoxContainer" parent="VBoxContainer"]
margin_top = 425.0 offset_top = 425.0
margin_right = 616.0 offset_right = 616.0
margin_bottom = 725.0 offset_bottom = 725.0
custom_constants/separation = 10 theme_override_constants/separation = 10
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="continue" type="Button" parent="VBoxContainer/menuitems"] [node name="continue" type="Button" parent="VBoxContainer/menuitems"]
margin_right = 616.0 offset_right = 616.0
margin_bottom = 150.0 offset_bottom = 150.0
rect_min_size = Vector2( 0, 150 ) custom_minimum_size = Vector2( 0, 150 )
size_flags_vertical = 3 size_flags_vertical = 3
text = "CONTINUE_GAME" text = "CONTINUE_GAME"
__meta__ = { __meta__ = {
@@ -66,9 +66,9 @@ __meta__ = {
} }
[node name="new_game" type="Button" parent="VBoxContainer/menuitems"] [node name="new_game" type="Button" parent="VBoxContainer/menuitems"]
margin_top = 160.0 offset_top = 160.0
margin_right = 616.0 offset_right = 616.0
margin_bottom = 180.0 offset_bottom = 180.0
size_flags_vertical = 3 size_flags_vertical = 3
text = "NEW_GAME" text = "NEW_GAME"
__meta__ = { __meta__ = {
@@ -76,9 +76,9 @@ __meta__ = {
} }
[node name="save_game" type="Button" parent="VBoxContainer/menuitems"] [node name="save_game" type="Button" parent="VBoxContainer/menuitems"]
margin_top = 190.0 offset_top = 190.0
margin_right = 616.0 offset_right = 616.0
margin_bottom = 210.0 offset_bottom = 210.0
size_flags_vertical = 3 size_flags_vertical = 3
text = "SAVE_GAME" text = "SAVE_GAME"
script = ExtResource( 6 ) script = ExtResource( 6 )
@@ -87,9 +87,9 @@ __meta__ = {
} }
[node name="load_game" type="Button" parent="VBoxContainer/menuitems"] [node name="load_game" type="Button" parent="VBoxContainer/menuitems"]
margin_top = 220.0 offset_top = 220.0
margin_right = 616.0 offset_right = 616.0
margin_bottom = 240.0 offset_bottom = 240.0
size_flags_vertical = 3 size_flags_vertical = 3
text = "LOAD_GAME" text = "LOAD_GAME"
script = ExtResource( 6 ) script = ExtResource( 6 )
@@ -98,15 +98,15 @@ __meta__ = {
} }
[node name="options" type="Button" parent="VBoxContainer/menuitems"] [node name="options" type="Button" parent="VBoxContainer/menuitems"]
margin_top = 250.0 offset_top = 250.0
margin_right = 616.0 offset_right = 616.0
margin_bottom = 270.0 offset_bottom = 270.0
text = "OPTIONS" text = "OPTIONS"
[node name="quit" type="Button" parent="VBoxContainer/menuitems"] [node name="quit" type="Button" parent="VBoxContainer/menuitems"]
margin_top = 280.0 offset_top = 280.0
margin_right = 616.0 offset_right = 616.0
margin_bottom = 300.0 offset_bottom = 300.0
size_flags_vertical = 3 size_flags_vertical = 3
text = "QUIT" text = "QUIT"
__meta__ = { __meta__ = {

View File

@@ -5,7 +5,7 @@ class_name ESCInventoryItem
var global_id: String = "" var global_id: String = ""
# The texture for the item # The texture for the item
var texture: Texture = null var texture: Texture2D = null
func _init(p_item: ESCItem) -> void: func _init(p_item: ESCItem) -> void:

View File

@@ -100,7 +100,7 @@ func set_current_room(room: ESCRoom) -> void:
func register_object(object: ESCObject, room: ESCRoom = null, force: bool = false, \ func register_object(object: ESCObject, room: ESCRoom = null, force: bool = false, \
auto_unregister: bool = true) -> void: auto_unregister: bool = true) -> void:
if object.global_id.empty(): if object.global_id.is_empty():
object.global_id = str(object.node.get_path()).split("/root/", false)[0] object.global_id = str(object.node.get_path()).split("/root/", false)[0]
object.node.global_id = object.global_id object.node.global_id = object.global_id
escoria.logger.warn( escoria.logger.warn(
@@ -121,10 +121,10 @@ func register_object(object: ESCObject, room: ESCRoom = null, force: bool = fals
# If a room was passed in, then we're going to register the object with it; # If a room was passed in, then we're going to register the object with it;
# otherwise, we register the object with the "current room". # otherwise, we register the object with the "current room".
if room == null or room.global_id.empty(): if room == null or room.global_id.is_empty():
# We duplicate the key so as to not hold a reference when current_room_key # We duplicate the key so as to not hold a reference when current_room_key
# changes. # changes.
if current_room_key.room_global_id.empty(): if current_room_key.room_global_id.is_empty():
escoria.logger.error( escoria.logger.error(
self, self,
"The current room has no Global ID.\n" + "The current room has no Global ID.\n" +
@@ -194,7 +194,7 @@ func register_object(object: ESCObject, room: ESCRoom = null, force: bool = fals
if "is_interactive" in object.node and object.node.is_interactive: if "is_interactive" in object.node and object.node.is_interactive:
object.interactive = true object.interactive = true
if "esc_script" in object.node and not object.node.esc_script.empty(): if "esc_script" in object.node and not object.node.esc_script.is_empty():
var script = escoria.esc_compiler.load_esc_file( var script = escoria.esc_compiler.load_esc_file(
object.node.esc_script object.node.esc_script
) )
@@ -240,7 +240,7 @@ func register_terrain(object: ESCObject, room: ESCRoom = null) -> void:
# If a room was passed in, then we're going to register the object with it; # If a room was passed in, then we're going to register the object with it;
# otherwise, we register the object with the "current room". # otherwise, we register the object with the "current room".
if not is_instance_valid(room) or room.global_id.empty(): if not is_instance_valid(room) or room.global_id.is_empty():
# We duplicate the key so as to not hold a reference when current_room_key # We duplicate the key so as to not hold a reference when current_room_key
# changes. # changes.
room_key.room_global_id = current_room_key.room_global_id room_key.room_global_id = current_room_key.room_global_id
@@ -259,7 +259,7 @@ func register_terrain(object: ESCObject, room: ESCRoom = null) -> void:
room_key.room_instance_id = room.get_instance_id() room_key.room_instance_id = room.get_instance_id()
var terrains: Dictionary = _get_room_terrain_navpolys(room_key) var terrains: Dictionary = _get_room_terrain_navpolys(room_key)
if object.node is NavigationPolygonInstance: if object.node is NavigationRegion2D:
terrains[object.global_id] = object terrains[object.global_id] = object
if terrains[object.global_id].node.enabled: if terrains[object.global_id].node.enabled:
terrains[object.global_id].state = "enabled" terrains[object.global_id].state = "enabled"
@@ -436,14 +436,14 @@ func save_game(p_savegame: ESCSaveGame) -> void:
p_savegame.objects = {} p_savegame.objects = {}
for room_obj in room_objects: for room_obj in room_objects:
if room_obj.room_global_id.empty(): if room_obj.room_global_id.is_empty():
continue continue
var room_objects_dict = {} var room_objects_dict = {}
for obj_id in room_obj.objects: for obj_id in room_obj.objects:
var obj: ESCObject = room_obj.objects[obj_id] var obj: ESCObject = room_obj.objects[obj_id]
var obj_json_to_save: Dictionary = obj.get_save_data() var obj_json_to_save: Dictionary = obj.get_save_data()
if not obj_json_to_save.empty(): if not obj_json_to_save.is_empty():
room_objects_dict[obj_id] = obj_json_to_save room_objects_dict[obj_id] = obj_json_to_save
p_savegame.objects[room_obj.room_global_id] = room_objects_dict p_savegame.objects[room_obj.room_global_id] = room_objects_dict

View File

@@ -1,15 +1,15 @@
@tool
# Plugin script to initialize Escoria simple mouse UI # Plugin script to initialize Escoria simple mouse UI
tool
extends EditorPlugin extends EditorPlugin
# Override function to return the plugin name. # Override function to return the plugin name.
func get_plugin_name(): func _get_plugin_name():
return "escoria-ui-return-monkey-island" return "escoria-ui-return-monkey-island"
# Deregister UI # Deregister UI
func disable_plugin(): func _disable_plugin():
print("Disabling plugin Escoria UI Return to Monkey Island.") print("Disabling plugin Escoria UI Return to Monkey Island.")
EscoriaPlugin.deregister_ui("res://addons/escoria-ui-return-monkey-island/game.tscn") EscoriaPlugin.deregister_ui("res://addons/escoria-ui-return-monkey-island/game.tscn")
ESCProjectSettingsManager.remove_setting( ESCProjectSettingsManager.remove_setting(
@@ -39,6 +39,6 @@ func enable_plugin():
) )
else: else:
get_editor_interface().set_plugin_enabled( get_editor_interface().set_plugin_enabled(
get_plugin_name(), _get_plugin_name(),
false false
) )

View File

@@ -1,6 +1,6 @@
[gd_resource type="Theme" load_steps=5 format=2] [gd_resource type="Theme" load_steps=5 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres" type="DynamicFont" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres" type="FontFile" id=1]
[sub_resource type="StyleBoxFlat" id=1] [sub_resource type="StyleBoxFlat" id=1]
content_margin_left = 4.0 content_margin_left = 4.0

View File

@@ -1,11 +1,11 @@
tool @tool
extends Node extends Node
signal finished signal finished
func play(video_file: String): func play(video_file: String):
$VideoPlayer.set_stream(load(video_file)) $VideoStreamPlayer.set_stream(load(video_file))
$VideoPlayer.play() $VideoStreamPlayer.play()
func _on_VideoPlayer_finished(): func _on_VideoPlayer_finished():
self.visible = false self.visible = false
@@ -13,15 +13,15 @@ func _on_VideoPlayer_finished():
func skip(): func skip():
$VideoPlayer.stop() $VideoStreamPlayer.stop()
self.visible = false self.visible = false
emit_signal("finished") emit_signal("finished")
func get_player(): func get_player():
return $VideoPlayer return $VideoStreamPlayer
func is_playing() -> bool: func is_playing() -> bool:
var play = $VideoPlayer.is_playing() var play = $VideoStreamPlayer.is_playing()
return play return play
func _on_Skip_pressed(): func _on_Skip_pressed():
skip() skip()

View File

@@ -8,36 +8,36 @@
[sub_resource type="InputEventAction" id=2] [sub_resource type="InputEventAction" id=2]
action = "ui_cancel" action = "ui_cancel"
[sub_resource type="ShortCut" id=3] [sub_resource type="Shortcut" id=3]
shortcut = SubResource( 2 ) shortcut = SubResource( 2 )
[node name="video_player" type="Control"] [node name="video_player" type="Control"]
margin_right = 1285.0 offset_right = 1285.0
margin_bottom = 753.0 offset_bottom = 753.0
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="ColorRect" type="ColorRect" parent="."] [node name="ColorRect" type="ColorRect" parent="."]
margin_left = -11.0 offset_left = -11.0
margin_top = -3.0 offset_top = -3.0
margin_right = 1285.0 offset_right = 1285.0
margin_bottom = 766.0 offset_bottom = 766.0
color = Color( 0, 0, 0, 1 ) color = Color( 0, 0, 0, 1 )
[node name="VideoPlayer" type="VideoPlayer" parent="."] [node name="VideoStreamPlayer" type="VideoStreamPlayer" parent="."]
margin_right = 1279.0 offset_right = 1279.0
margin_bottom = 771.0 offset_bottom = 771.0
stream = SubResource( 1 ) stream = SubResource( 1 )
expand = false expand = false
[node name="Skip" type="Button" parent="."] [node name="Skip" type="Button" parent="."]
margin_left = 1163.0 offset_left = 1163.0
margin_top = 680.0 offset_top = 680.0
margin_right = 1250.0 offset_right = 1250.0
margin_bottom = 712.0 offset_bottom = 712.0
theme = ExtResource( 2 ) theme = ExtResource( 2 )
shortcut_in_tooltip = false shortcut_in_tooltip = false
shortcut = SubResource( 3 ) shortcut = SubResource( 3 )
text = "Saltar video" text = "Saltar video"
[connection signal="finished" from="VideoPlayer" to="." method="_on_VideoPlayer_finished"] [connection signal="finished" from="VideoStreamPlayer" to="." method="_on_VideoPlayer_finished"]
[connection signal="pressed" from="Skip" to="." method="_on_Skip_pressed"] [connection signal="pressed" from="Skip" to="." method="_on_Skip_pressed"]

View File

@@ -1,6 +1,6 @@
[gd_resource type="Environment" load_steps=2 format=2] [gd_resource type="Environment" load_steps=2 format=2]
[sub_resource type="ProceduralSky" id=1] [sub_resource type="Sky" id=1]
[resource] [resource]
background_mode = 2 background_mode = 2

View File

@@ -2,22 +2,22 @@
[ext_resource path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" type="Resource" id=1] [ext_resource path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" type="Resource" id=1]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=2] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=2]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-005.png" type="Texture" id=4] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-005.png" type="Texture2D" id=4]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-002.png" type="Texture" id=5] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-002.png" type="Texture2D" id=5]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-003.png" type="Texture" id=6] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-003.png" type="Texture2D" id=6]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-001.png" type="Texture" id=7] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-001.png" type="Texture2D" id=7]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-010.png" type="Texture" id=8] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-010.png" type="Texture2D" id=8]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-016.png" type="Texture" id=9] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-016.png" type="Texture2D" id=9]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-009.png" type="Texture" id=10] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-009.png" type="Texture2D" id=10]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-008.png" type="Texture" id=11] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-008.png" type="Texture2D" id=11]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-012.png" type="Texture" id=12] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-012.png" type="Texture2D" id=12]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-013.png" type="Texture" id=13] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-013.png" type="Texture2D" id=13]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-004.png" type="Texture" id=14] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-004.png" type="Texture2D" id=14]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-006.png" type="Texture" id=15] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-006.png" type="Texture2D" id=15]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-007.png" type="Texture" id=16] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-007.png" type="Texture2D" id=16]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-015.png" type="Texture" id=17] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-015.png" type="Texture2D" id=17]
[ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-014.png" type="Texture" id=18] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-014.png" type="Texture2D" id=18]
[ext_resource path="res://gymkhana/characters/eneko/assets/speak-2.png" type="Texture" id=20] [ext_resource path="res://gymkhana/characters/eneko/assets/speak-2.png" type="Texture2D" id=20]
[sub_resource type="AtlasTexture" id=2] [sub_resource type="AtlasTexture" id=2]
flags = 4 flags = 4
@@ -38,7 +38,7 @@ animations = [ {
} ] } ]
[node name="ESCPlayerWithTooltip2" type="Area2D"] [node name="ESCPlayerWithTooltip2" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 2 ) script = ExtResource( 2 )
global_id = "eneko_smoking" global_id = "eneko_smoking"
esc_script = "res://gymkhana/characters/eneko/eneko_smoking.esc" esc_script = "res://gymkhana/characters/eneko/eneko_smoking.esc"
@@ -61,15 +61,15 @@ target_when_selected_action_is_in = [ "action3" ]
selectable = true selectable = true
animations = ExtResource( 1 ) animations = ExtResource( 1 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."] [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2( 32.625, -50.56 ) position = Vector2( 32.625, -50.56 )
scale = Vector2( 0.8, 0.8 ) scale = Vector2( 0.8, 0.8 )
frames = SubResource( 1 ) frames = SubResource( 1 )
animation = "speak" animation = "speak"
flip_h = true flip_h = true
[node name="dialog_position" type="Position2D" parent="."] [node name="dialog_position" type="Marker2D" parent="."]
position = Vector2( 36, -253 ) position = Vector2( 36, -253 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
polygon = PoolVector2Array( -5, 6, -4, 22, -7, 32, -10, 39, -6, 43, 7, 43, 12, 35, 14, 25, 12, 12, 10, -25, 31, -38, 32, 37, 48, 37, 49, 28, 46, 22, 50, -1, 51, -35, 57, -39, 57, -72, 58, -74, 70, -68, 76, -69, 79, -76, 78, -81, 72, -89, 67, -104, 56, -114, 47, -115, 45, -120, 46, -140, 38, -145, 34, -146, 28, -144, 24, -139, 22, -129, 24, -122, 23, -119, 17, -114, 5, -109, -7, -80, -7, -62, 4, -58, 5, -53, -7, -34 ) polygon = PackedVector2Array( -5, 6, -4, 22, -7, 32, -10, 39, -6, 43, 7, 43, 12, 35, 14, 25, 12, 12, 10, -25, 31, -38, 32, 37, 48, 37, 49, 28, 46, 22, 50, -1, 51, -35, 57, -39, 57, -72, 58, -74, 70, -68, 76, -69, 79, -76, 78, -81, 72, -89, 67, -104, 56, -114, 47, -115, 45, -120, 46, -140, 38, -145, 34, -146, 28, -144, 24, -139, 22, -129, 24, -122, 23, -119, 17, -114, 5, -109, -7, -80, -7, -62, 4, -58, 5, -53, -7, -34 )

View File

@@ -1,9 +1,9 @@
[gd_scene load_steps=32 format=2] [gd_scene load_steps=32 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/characters/oier/oier-mod.png" type="Texture" id=2] [ext_resource path="res://gymkhana/characters/oier/oier-mod.png" type="Texture2D" id=2]
[ext_resource path="res://gymkhana/characters/oier/oier_animations.tres" type="Resource" id=3] [ext_resource path="res://gymkhana/characters/oier/oier_animations.tres" type="Resource" id=3]
[ext_resource path="res://gymkhana/characters/oier/oier-mod-talk.png" type="Texture" id=4] [ext_resource path="res://gymkhana/characters/oier/oier-mod-talk.png" type="Texture2D" id=4]
[sub_resource type="AtlasTexture" id=22] [sub_resource type="AtlasTexture" id=22]
flags = 4 flags = 4
@@ -193,7 +193,7 @@ radius = 53.0
height = 208.0 height = 208.0
[node name="ESCPlayerWithTooltip" type="Area2D"] [node name="ESCPlayerWithTooltip" type="Area2D"]
pause_mode = 1 process_mode = 1
position = Vector2( -5, 0 ) position = Vector2( -5, 0 )
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "player" global_id = "player"
@@ -205,7 +205,7 @@ combine_when_selected_action_is_in = [ ]
dialog_color = Color( 0.321569, 0.662745, 0.301961, 1 ) dialog_color = Color( 0.321569, 0.662745, 0.301961, 1 )
animations = ExtResource( 3 ) animations = ExtResource( 3 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."] [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2( 0, -155 ) position = Vector2( 0, -155 )
scale = Vector2( 0.389246, 0.389247 ) scale = Vector2( 0.389246, 0.389247 )
frames = SubResource( 20 ) frames = SubResource( 20 )
@@ -215,5 +215,5 @@ animation = "speak_down"
position = Vector2( 5, -151 ) position = Vector2( 5, -151 )
shape = SubResource( 21 ) shape = SubResource( 21 )
[node name="dialog_position" type="Position2D" parent="."] [node name="dialog_position" type="Marker2D" parent="."]
position = Vector2( 1, -473 ) position = Vector2( 1, -473 )

View File

@@ -2,7 +2,7 @@
[ext_resource path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" type="Resource" id=1] [ext_resource path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" type="Resource" id=1]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=2] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=2]
[ext_resource path="res://gymkhana/characters/talking-heads/assets/eneko-avatar-talking.png" type="Texture" id=3] [ext_resource path="res://gymkhana/characters/talking-heads/assets/eneko-avatar-talking.png" type="Texture2D" id=3]
[sub_resource type="AtlasTexture" id=2] [sub_resource type="AtlasTexture" id=2]
flags = 4 flags = 4
@@ -36,7 +36,7 @@ animations = [ {
radius = 40.1123 radius = 40.1123
[node name="ESCPlayerWithTooltip2" type="Area2D"] [node name="ESCPlayerWithTooltip2" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 2 ) script = ExtResource( 2 )
global_id = "eneko_head" global_id = "eneko_head"
is_interactive = false is_interactive = false
@@ -58,14 +58,14 @@ target_when_selected_action_is_in = [ "action3" ]
selectable = true selectable = true
animations = ExtResource( 1 ) animations = ExtResource( 1 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."] [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2( -1, 0 ) position = Vector2( -1, 0 )
scale = Vector2( 1.67778, 1.67778 ) scale = Vector2( 1.67778, 1.67778 )
frames = SubResource( 1 ) frames = SubResource( 1 )
animation = "speak" animation = "speak"
flip_h = true flip_h = true
[node name="dialog_position" type="Position2D" parent="."] [node name="dialog_position" type="Marker2D" parent="."]
position = Vector2( -1, -153 ) position = Vector2( -1, -153 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]

View File

@@ -2,7 +2,7 @@
[ext_resource path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" type="Resource" id=1] [ext_resource path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" type="Resource" id=1]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=2] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=2]
[ext_resource path="res://gymkhana/characters/talking-heads/assets/oier-avatar-talking.png" type="Texture" id=3] [ext_resource path="res://gymkhana/characters/talking-heads/assets/oier-avatar-talking.png" type="Texture2D" id=3]
[sub_resource type="AtlasTexture" id=2] [sub_resource type="AtlasTexture" id=2]
flags = 4 flags = 4
@@ -36,7 +36,7 @@ animations = [ {
radius = 40.1123 radius = 40.1123
[node name="ESCPlayerWithTooltip2" type="Area2D"] [node name="ESCPlayerWithTooltip2" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 2 ) script = ExtResource( 2 )
global_id = "oier_head" global_id = "oier_head"
is_interactive = false is_interactive = false
@@ -58,14 +58,14 @@ target_when_selected_action_is_in = [ "action3" ]
selectable = true selectable = true
animations = ExtResource( 1 ) animations = ExtResource( 1 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."] [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2( -1, 0 ) position = Vector2( -1, 0 )
scale = Vector2( 1.67778, 1.67778 ) scale = Vector2( 1.67778, 1.67778 )
frames = SubResource( 1 ) frames = SubResource( 1 )
animation = "speak" animation = "speak"
flip_h = true flip_h = true
[node name="dialog_position" type="Position2D" parent="."] [node name="dialog_position" type="Marker2D" parent="."]
position = Vector2( -1, -153 ) position = Vector2( -1, -153 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]

View File

@@ -1,10 +1,10 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_ajo.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_ajo.png" type="Texture2D" id=2]
[node name="turno_cocina_ajo" type="Area2D"] [node name="turno_cocina_ajo" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_ajo" global_id = "turno_cocina_ajo"
esc_script = "res://gymkhana/items/inventory/turno_cocina_ajo.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_ajo.esc"
@@ -20,9 +20,9 @@ custom_data = {
} }
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
scale = Vector2( 0.101548, 0.101548 ) scale = Vector2( 0.101548, 0.101548 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
polygon = PoolVector2Array( -7, -6, 7, -6, 7, 6, -7, 6 ) polygon = PackedVector2Array( -7, -6, 7, -6, 7, 6, -7, 6 )

View File

@@ -1,14 +1,14 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_bol_inventario.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_bol_inventario.png" type="Texture2D" id=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 22.5, 12.5 ) extents = Vector2( 22.5, 12.5 )
[node name="turno_cocina_bol" type="Area2D"] [node name="turno_cocina_bol" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_bol" global_id = "turno_cocina_bol"
esc_script = "res://gymkhana/items/inventory/turno_cocina_bol.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_bol.esc"

View File

@@ -1,14 +1,14 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_bol_lentejas.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_bol_lentejas.png" type="Texture2D" id=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 22.5, 12.5 ) extents = Vector2( 22.5, 12.5 )
[node name="turno_cocina_bol_lentejas" type="Area2D"] [node name="turno_cocina_bol_lentejas" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_bol_lentejas" global_id = "turno_cocina_bol_lentejas"
esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_lentejas.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_lentejas.esc"
@@ -23,7 +23,7 @@ custom_data = {
combine_when_selected_action_is_in = [ "action4" ] combine_when_selected_action_is_in = [ "action4" ]
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2( -2, 0 ) position = Vector2( -2, 0 )
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
@@ -32,6 +32,6 @@ texture = ExtResource( 2 )
position = Vector2( -1.5, -0.5 ) position = Vector2( -1.5, -0.5 )
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="ESCLocation" type="Position2D" parent="."] [node name="ESCLocation" type="Marker2D" parent="."]
position = Vector2( -51, 69 ) position = Vector2( -51, 69 )
script = ExtResource( 3 ) script = ExtResource( 3 )

View File

@@ -1,14 +1,14 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_bol_lentejas_agua.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_bol_lentejas_agua.png" type="Texture2D" id=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 22.5, 12.5 ) extents = Vector2( 22.5, 12.5 )
[node name="turno_cocina_bol_lentejas_agua" type="Area2D"] [node name="turno_cocina_bol_lentejas_agua" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_bol_lentejas_agua" global_id = "turno_cocina_bol_lentejas_agua"
esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.esc"
@@ -24,7 +24,7 @@ custom_data = {
} }
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2( -2, 0 ) position = Vector2( -2, 0 )
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
@@ -33,6 +33,6 @@ texture = ExtResource( 2 )
position = Vector2( -1.5, -0.5 ) position = Vector2( -1.5, -0.5 )
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="ESCLocation" type="Position2D" parent="."] [node name="ESCLocation" type="Marker2D" parent="."]
position = Vector2( -51, 69 ) position = Vector2( -51, 69 )
script = ExtResource( 3 ) script = ExtResource( 3 )

View File

@@ -1,11 +1,11 @@
[gd_scene load_steps=4 format=2] [gd_scene load_steps=4 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_carton.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_carton.png" type="Texture2D" id=2]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_carton_inventario.png" type="Texture" id=3] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_carton_inventario.png" type="Texture2D" id=3]
[node name="turno_cocina_carton" type="Area2D"] [node name="turno_cocina_carton" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_carton" global_id = "turno_cocina_carton"
esc_script = "res://gymkhana/items/inventory/turno_cocina_carton.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_carton.esc"
@@ -26,8 +26,8 @@ action3_target_texts = {
target_when_selected_action_is_in = [ "action3" ] target_when_selected_action_is_in = [ "action3" ]
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
texture = ExtResource( 2 ) texture = ExtResource( 2 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
polygon = PoolVector2Array( -23, -11, -24, 2, -24, 11, -21, 13, -6, 16, 5, 17, 21, 12, 25, 8, 25, -13, 0, -16, -9, -17 ) polygon = PackedVector2Array( -23, -11, -24, 2, -24, 11, -21, 13, -6, 16, 5, 17, 21, 12, 25, 8, 25, -13, 0, -16, -9, -17 )

View File

@@ -1,10 +1,10 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_carton_encendido.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_carton_encendido.png" type="Texture2D" id=2]
[node name="turno_cocina_carton_encendido" type="Area2D"] [node name="turno_cocina_carton_encendido" type="Area2D"]
pause_mode = 1 process_mode = 1
rotation = 1.11177 rotation = 1.11177
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_carton_encendido" global_id = "turno_cocina_carton_encendido"
@@ -20,10 +20,10 @@ custom_data = {
} }
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2( -2, 0 ) position = Vector2( -2, 0 )
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
polygon = PoolVector2Array( -13, -32, 1, -29, 1, -26, 24, -19, 17, 14, 7, 32, -29, 12, -15, -3, -15, -8, -13, -12 ) polygon = PackedVector2Array( -13, -32, 1, -29, 1, -26, 24, -19, 17, 14, 7, 32, -29, 12, -15, -3, -15, -8, -13, -12 )

View File

@@ -1,10 +1,10 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_cuchillo.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_cuchillo.png" type="Texture2D" id=2]
[node name="turno_cocina_cuchillo" type="Area2D"] [node name="turno_cocina_cuchillo" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_cuchillo" global_id = "turno_cocina_cuchillo"
esc_script = "res://gymkhana/items/inventory/turno_cocina_cuchillo.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_cuchillo.esc"

View File

@@ -1,11 +1,11 @@
[gd_scene load_steps=4 format=2] [gd_scene load_steps=4 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno.png" type="Texture2D" id=2]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno_inventario.png" type="Texture" id=3] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno_inventario.png" type="Texture2D" id=3]
[node name="turno_cocina_cuerno" type="Area2D"] [node name="turno_cocina_cuerno" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_cuerno" global_id = "turno_cocina_cuerno"
esc_script = "res://gymkhana/items/inventory/turno_cocina_cuerno.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_cuerno.esc"
@@ -22,9 +22,9 @@ custom_data = {
} }
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2( 8.125, -8.125 ) position = Vector2( 8.125, -8.125 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
polygon = PoolVector2Array( -11, -22, -11, -32, -10, -42, -7, -46, 0, -49, 3, -49, 9, -48, 13, -43, 12, -33, 7, -24, 5, -13, 5, -4, 7, 4, 11, 13, 16, 19, 23, 24, 28, 27, 27, 32, 24, 33, 18, 32, 11, 28, 3, 22, -3, 15, -8, 5, -10, -4, -11, -15 ) polygon = PackedVector2Array( -11, -22, -11, -32, -10, -42, -7, -46, 0, -49, 3, -49, 9, -48, 13, -43, 12, -33, 7, -24, 5, -13, 5, -4, 7, 4, 11, 13, 16, 19, 23, 24, 28, 27, 27, 32, 24, 33, 18, 32, 11, 28, 3, 22, -3, 15, -8, 5, -10, -4, -11, -15 )

View File

@@ -1,14 +1,14 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_frontal.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_frontal.png" type="Texture2D" id=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 22.5, 12.5 ) extents = Vector2( 22.5, 12.5 )
[node name="turno_cocina_frontal" type="Area2D"] [node name="turno_cocina_frontal" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_frontal" global_id = "turno_cocina_frontal"
esc_script = "res://gymkhana/items/inventory/turno_cocina_frontal.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_frontal.esc"
@@ -23,7 +23,7 @@ custom_data = {
combine_when_selected_action_is_in = [ "action4" ] combine_when_selected_action_is_in = [ "action4" ]
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2( -2, 0 ) position = Vector2( -2, 0 )
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
@@ -32,6 +32,6 @@ texture = ExtResource( 2 )
position = Vector2( -1.5, -0.5 ) position = Vector2( -1.5, -0.5 )
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="ESCLocation" type="Position2D" parent="."] [node name="ESCLocation" type="Marker2D" parent="."]
position = Vector2( -51, 69 ) position = Vector2( -51, 69 )
script = ExtResource( 3 ) script = ExtResource( 3 )

View File

@@ -1,10 +1,10 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_libro_de_cocina.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_libro_de_cocina.png" type="Texture2D" id=2]
[node name="turno_cocina_libro_de_cocina" type="Area2D"] [node name="turno_cocina_libro_de_cocina" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_libro_de_cocina" global_id = "turno_cocina_libro_de_cocina"
esc_script = "res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.esc"

View File

@@ -1,14 +1,14 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_madera.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_madera.png" type="Texture2D" id=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 22.5, 12.5 ) extents = Vector2( 22.5, 12.5 )
[node name="turno_cocina_madera" type="Area2D"] [node name="turno_cocina_madera" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_madera" global_id = "turno_cocina_madera"
esc_script = "res://gymkhana/items/inventory/turno_cocina_madera.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_madera.esc"

View File

@@ -1,10 +1,10 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_mechero.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_mechero.png" type="Texture2D" id=2]
[node name="turno_cocina_mechero" type="Area2D"] [node name="turno_cocina_mechero" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_mechero" global_id = "turno_cocina_mechero"
esc_script = "res://gymkhana/items/inventory/turno_cocina_mechero.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_mechero.esc"
@@ -21,10 +21,10 @@ custom_data = {
} }
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2( -2, 0 ) position = Vector2( -2, 0 )
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
polygon = PoolVector2Array( -15, -29, 3, -33, 10, 30, -3, 32 ) polygon = PackedVector2Array( -15, -29, 3, -33, 10, 30, -3, 32 )

View File

@@ -1,13 +1,13 @@
[gd_scene load_steps=6 format=2] [gd_scene load_steps=6 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_con_agua.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_con_agua.png" type="Texture2D" id=2]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" type="Texture" id=3] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" type="Texture2D" id=3]
[ext_resource path="res://gymkhana/particles/SmokeParticles.tscn" type="PackedScene" id=4] [ext_resource path="res://gymkhana/particles/SmokeParticles.tscn" type="PackedScene" id=4]
[ext_resource path="res://gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd" type="Script" id=5] [ext_resource path="res://gymkhana/items/inventory/scripts/turno_cocina_olla_llena_economica_encendida_observer.gd" type="Script" id=5]
[node name="turno_cocina_olla_llena" type="Area2D"] [node name="turno_cocina_olla_llena" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_olla_llena" global_id = "turno_cocina_olla_llena"
esc_script = "res://gymkhana/items/inventory/turno_cocina_olla_llena.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_olla_llena.esc"
@@ -32,11 +32,11 @@ action3_target_texts = {
target_when_selected_action_is_in = [ "action3" ] target_when_selected_action_is_in = [ "action3" ]
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
texture = ExtResource( 3 ) texture = ExtResource( 3 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
polygon = PoolVector2Array( -59, 25, -59, 47, -35, 56, 7, 58, 54, 52, 55, -13, 61, -50, 35, -60, -18, -60, -62, -54 ) polygon = PackedVector2Array( -59, 25, -59, 47, -35, 56, 7, 58, 54, 52, 55, -13, 61, -50, 35, -60, -18, -60, -62, -54 )
[node name="SmokeParticles" parent="." instance=ExtResource( 4 )] [node name="SmokeParticles" parent="." instance=ExtResource( 4 )]
script = ExtResource( 5 ) script = ExtResource( 5 )

View File

@@ -1,11 +1,11 @@
[gd_scene load_steps=4 format=2] [gd_scene load_steps=4 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_vacia.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla_inv_vacia.png" type="Texture2D" id=2]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" type="Texture" id=3] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_olla.png" type="Texture2D" id=3]
[node name="turno_cocina_olla_vacia" type="Area2D"] [node name="turno_cocina_olla_vacia" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_olla_vacia" global_id = "turno_cocina_olla_vacia"
esc_script = "res://gymkhana/items/inventory/turno_cocina_olla_vacia.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_olla_vacia.esc"
@@ -29,8 +29,8 @@ action3_target_texts = {
} }
target_when_selected_action_is_in = [ "action3" ] target_when_selected_action_is_in = [ "action3" ]
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
texture = ExtResource( 3 ) texture = ExtResource( 3 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
polygon = PoolVector2Array( -59, 41, -59, -44, -63, -48, -62, -52, -59, -54, -49, -58, -34, -60, -16, -62, 1, -61, 21, -60, 44, -57, 57, -53, 61, -47, 58, -41, 56, -29, 62, -29, 64, -27, 58, -25, 56, -21, 53, 33, 50, 44, 44, 52, 33, 55, 12, 59, -12, 59, -40, 56, -54, 50 ) polygon = PackedVector2Array( -59, 41, -59, -44, -63, -48, -62, -52, -59, -54, -49, -58, -34, -60, -16, -62, 1, -61, 21, -60, 44, -57, 57, -53, 61, -47, 58, -41, 56, -29, 62, -29, 64, -27, 58, -25, 56, -21, 53, 33, 50, 44, 44, 52, 33, 55, 12, 59, -12, 59, -40, 56, -54, 50 )

View File

@@ -1,14 +1,14 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" type="Texture2D" id=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 22.5, 12.5 ) extents = Vector2( 22.5, 12.5 )
[node name="turno_cocina_patata" type="Area2D"] [node name="turno_cocina_patata" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_patata" global_id = "turno_cocina_patata"
esc_script = "res://gymkhana/items/inventory/turno_cocina_patata.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_patata.esc"
@@ -36,7 +36,7 @@ custom_data = {
} }
} }
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2( -2, 0 ) position = Vector2( -2, 0 )
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
@@ -45,6 +45,6 @@ texture = ExtResource( 2 )
position = Vector2( -1.5, -0.5 ) position = Vector2( -1.5, -0.5 )
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="ESCLocation" type="Position2D" parent="."] [node name="ESCLocation" type="Marker2D" parent="."]
position = Vector2( -51, 69 ) position = Vector2( -51, 69 )
script = ExtResource( 3 ) script = ExtResource( 3 )

View File

@@ -1,10 +1,10 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_patata_grande.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_patata_grande.png" type="Texture2D" id=2]
[node name="turno_cocina_patata_grande" type="Area2D"] [node name="turno_cocina_patata_grande" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_patata_grande" global_id = "turno_cocina_patata_grande"
esc_script = "res://gymkhana/items/inventory/turno_cocina_patata_grande.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_patata_grande.esc"

View File

@@ -1,10 +1,10 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_pegatina.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_pegatina.png" type="Texture2D" id=2]
[node name="turno_cocina_pegatina" type="Area2D"] [node name="turno_cocina_pegatina" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_pegatina" global_id = "turno_cocina_pegatina"
esc_script = "res://gymkhana/items/inventory/turno_cocina_pegatina.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_pegatina.esc"
@@ -18,10 +18,10 @@ custom_data = {
} }
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2( -2, 0 ) position = Vector2( -2, 0 )
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
polygon = PoolVector2Array( -15, -29, 3, -33, 10, 30, -3, 32 ) polygon = PackedVector2Array( -15, -29, 3, -33, 10, 30, -3, 32 )

View File

@@ -1,11 +1,11 @@
[gd_scene load_steps=4 format=2] [gd_scene load_steps=4 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso.png" type="Texture2D" id=2]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" type="Texture" id=3] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" type="Texture2D" id=3]
[node name="turno_cocina_peso" type="Area2D"] [node name="turno_cocina_peso" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_peso" global_id = "turno_cocina_peso"
esc_script = "res://gymkhana/items/inventory/turno_cocina_peso.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_peso.esc"
@@ -27,7 +27,7 @@ action3_target_texts = {
target_when_selected_action_is_in = [ "action3" ] target_when_selected_action_is_in = [ "action3" ]
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
rotation = -0.0698132 rotation = -0.0698132
scale = Vector2( 0.18, 0.18 ) scale = Vector2( 0.18, 0.18 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )

View File

@@ -1,14 +1,14 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso_bol.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso_bol.png" type="Texture2D" id=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 22.5, 12.5 ) extents = Vector2( 22.5, 12.5 )
[node name="turno_cocina_peso_bol" type="Area2D"] [node name="turno_cocina_peso_bol" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_peso_bol" global_id = "turno_cocina_peso_bol"
esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_bol.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_bol.esc"
@@ -26,7 +26,7 @@ custom_data = {
target_when_selected_action_is_in = [ "action3" ] target_when_selected_action_is_in = [ "action3" ]
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2( -2, 0 ) position = Vector2( -2, 0 )
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
@@ -35,6 +35,6 @@ texture = ExtResource( 2 )
position = Vector2( -1.5, -0.5 ) position = Vector2( -1.5, -0.5 )
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="ESCLocation" type="Position2D" parent="."] [node name="ESCLocation" type="Marker2D" parent="."]
position = Vector2( -51, 69 ) position = Vector2( -51, 69 )
script = ExtResource( 3 ) script = ExtResource( 3 )

View File

@@ -1,14 +1,14 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" type="Texture2D" id=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 22.5, 12.5 ) extents = Vector2( 22.5, 12.5 )
[node name="turno_cocina_peso_inventario" type="Area2D"] [node name="turno_cocina_peso_inventario" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_peso_inventario" global_id = "turno_cocina_peso_inventario"
esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_inventario.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_inventario.esc"
@@ -24,7 +24,7 @@ custom_data = {
} }
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2( -2, 0 ) position = Vector2( -2, 0 )
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
@@ -33,6 +33,6 @@ texture = ExtResource( 2 )
position = Vector2( -1.5, -0.5 ) position = Vector2( -1.5, -0.5 )
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="ESCLocation" type="Position2D" parent="."] [node name="ESCLocation" type="Marker2D" parent="."]
position = Vector2( -51, 69 ) position = Vector2( -51, 69 )
script = ExtResource( 3 ) script = ExtResource( 3 )

View File

@@ -1,11 +1,11 @@
[gd_scene load_steps=4 format=2] [gd_scene load_steps=4 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso.png" type="Texture2D" id=2]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" type="Texture" id=3] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_peso_inventario.png" type="Texture2D" id=3]
[node name="turno_cocina_peso_usado" type="Area2D"] [node name="turno_cocina_peso_usado" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_peso_usado" global_id = "turno_cocina_peso_usado"
esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_usado.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_usado.esc"
@@ -19,7 +19,7 @@ custom_data = {
} }
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
rotation = -0.0698132 rotation = -0.0698132
scale = Vector2( 0.18, 0.18 ) scale = Vector2( 0.18, 0.18 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )

View File

@@ -1,10 +1,10 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=3 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_romero.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_romero.png" type="Texture2D" id=2]
[node name="turno_cocina_romero" type="Area2D"] [node name="turno_cocina_romero" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_romero" global_id = "turno_cocina_romero"
esc_script = "res://gymkhana/items/inventory/turno_cocina_romero.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_romero.esc"

View File

@@ -1,14 +1,14 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_salero.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_salero.png" type="Texture2D" id=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 22.5, 12.5 ) extents = Vector2( 22.5, 12.5 )
[node name="turno_cocina_salero" type="Area2D"] [node name="turno_cocina_salero" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_salero" global_id = "turno_cocina_salero"
esc_script = "res://gymkhana/items/inventory/turno_cocina_salero.esc" esc_script = "res://gymkhana/items/inventory/turno_cocina_salero.esc"
@@ -24,7 +24,7 @@ custom_data = {
} }
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2( -2, 0 ) position = Vector2( -2, 0 )
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
@@ -33,6 +33,6 @@ texture = ExtResource( 2 )
position = Vector2( -1.5, -0.5 ) position = Vector2( -1.5, -0.5 )
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="ESCLocation" type="Position2D" parent="."] [node name="ESCLocation" type="Marker2D" parent="."]
position = Vector2( -51, 69 ) position = Vector2( -51, 69 )
script = ExtResource( 3 ) script = ExtResource( 3 )

View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=4 format=2] [gd_scene load_steps=4 format=2]
[ext_resource path="res://gymkhana/particles/assets/smoke.png" type="Texture" id=1] [ext_resource path="res://gymkhana/particles/assets/smoke.png" type="Texture2D" id=1]
[sub_resource type="Curve" id=1] [sub_resource type="Curve" id=1]
min_value = -360.0 min_value = -360.0
@@ -8,7 +8,7 @@ max_value = 360.0
_data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 13.0909 ), 0.0, 0.0, 0, 0 ] _data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 13.0909 ), 0.0, 0.0, 0, 0 ]
[sub_resource type="Gradient" id=2] [sub_resource type="Gradient" id=2]
colors = PoolColorArray( 0.8125, 0.8125, 0.8125, 1, 0.917647, 0.917647, 0.917647, 0 ) colors = PackedColorArray( 0.8125, 0.8125, 0.8125, 1, 0.917647, 0.917647, 0.917647, 0 )
[node name="SmokeParticles" type="CPUParticles2D"] [node name="SmokeParticles" type="CPUParticles2D"]
position = Vector2( -2, -63 ) position = Vector2( -2, -63 )

View File

@@ -3,10 +3,10 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=1]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=3] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=3]
[ext_resource path="res://gymkhana/rooms/intro/escoria_background.png" type="Texture" id=4] [ext_resource path="res://gymkhana/rooms/intro/escoria_background.png" type="Texture2D" id=4]
[ext_resource path="res://gymkhana/rooms/intro/escoria-logo-comet-anim.png" type="Texture" id=5] [ext_resource path="res://gymkhana/rooms/intro/escoria-logo-comet-anim.png" type="Texture2D" id=5]
[ext_resource path="res://gymkhana/rooms/intro/escoria-logo-comet.png" type="Texture" id=6] [ext_resource path="res://gymkhana/rooms/intro/escoria-logo-comet.png" type="Texture2D" id=6]
[ext_resource path="res://gymkhana/rooms/intro/intro_background_space.png" type="Texture" id=7] [ext_resource path="res://gymkhana/rooms/intro/intro_background_space.png" type="Texture2D" id=7]
[sub_resource type="AtlasTexture" id=1] [sub_resource type="AtlasTexture" id=1]
flags = 4 flags = 4
@@ -55,8 +55,8 @@ tracks/0/loop_wrap = true
tracks/0/imported = false tracks/0/imported = false
tracks/0/enabled = true tracks/0/enabled = true
tracks/0/keys = { tracks/0/keys = {
"times": PoolRealArray( 0 ), "times": PackedFloat32Array( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PackedFloat32Array( 1 ),
"update": 0, "update": 0,
"values": [ false ] "values": [ false ]
} }
@@ -67,8 +67,8 @@ tracks/1/loop_wrap = true
tracks/1/imported = false tracks/1/imported = false
tracks/1/enabled = true tracks/1/enabled = true
tracks/1/keys = { tracks/1/keys = {
"times": PoolRealArray( 0 ), "times": PackedFloat32Array( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PackedFloat32Array( 1 ),
"update": 1, "update": 1,
"values": [ false ] "values": [ false ]
} }
@@ -79,8 +79,8 @@ tracks/2/loop_wrap = true
tracks/2/imported = false tracks/2/imported = false
tracks/2/enabled = true tracks/2/enabled = true
tracks/2/keys = { tracks/2/keys = {
"times": PoolRealArray( 0 ), "times": PackedFloat32Array( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PackedFloat32Array( 1 ),
"update": 1, "update": 1,
"values": [ true ] "values": [ true ]
} }
@@ -91,8 +91,8 @@ tracks/3/loop_wrap = true
tracks/3/imported = false tracks/3/imported = false
tracks/3/enabled = true tracks/3/enabled = true
tracks/3/keys = { tracks/3/keys = {
"times": PoolRealArray( 0 ), "times": PackedFloat32Array( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PackedFloat32Array( 1 ),
"update": 0, "update": 0,
"values": [ Vector2( 620, 450 ) ] "values": [ Vector2( 620, 450 ) ]
} }
@@ -103,8 +103,8 @@ tracks/4/loop_wrap = true
tracks/4/imported = false tracks/4/imported = false
tracks/4/enabled = true tracks/4/enabled = true
tracks/4/keys = { tracks/4/keys = {
"times": PoolRealArray( 0 ), "times": PackedFloat32Array( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PackedFloat32Array( 1 ),
"update": 0, "update": 0,
"values": [ true ] "values": [ true ]
} }
@@ -118,8 +118,8 @@ tracks/0/loop_wrap = true
tracks/0/imported = false tracks/0/imported = false
tracks/0/enabled = true tracks/0/enabled = true
tracks/0/keys = { tracks/0/keys = {
"times": PoolRealArray( 0, 3 ), "times": PackedFloat32Array( 0, 3 ),
"transitions": PoolRealArray( 1, 1 ), "transitions": PackedFloat32Array( 1, 1 ),
"update": 0, "update": 0,
"values": [ Vector2( 350, -20 ), Vector2( 630, 471 ) ] "values": [ Vector2( 350, -20 ), Vector2( 630, 471 ) ]
} }
@@ -130,8 +130,8 @@ tracks/1/loop_wrap = true
tracks/1/imported = false tracks/1/imported = false
tracks/1/enabled = true tracks/1/enabled = true
tracks/1/keys = { tracks/1/keys = {
"times": PoolRealArray( 0 ), "times": PackedFloat32Array( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PackedFloat32Array( 1 ),
"update": 1, "update": 1,
"values": [ true ] "values": [ true ]
} }
@@ -142,8 +142,8 @@ tracks/2/loop_wrap = true
tracks/2/imported = false tracks/2/imported = false
tracks/2/enabled = true tracks/2/enabled = true
tracks/2/keys = { tracks/2/keys = {
"times": PoolRealArray( 0, 3 ), "times": PackedFloat32Array( 0, 3 ),
"transitions": PoolRealArray( 1, 1 ), "transitions": PackedFloat32Array( 1, 1 ),
"update": 0, "update": 0,
"values": [ Vector2( 0.1, 0.1 ), Vector2( 1, 1 ) ] "values": [ Vector2( 0.1, 0.1 ), Vector2( 1, 1 ) ]
} }
@@ -154,8 +154,8 @@ tracks/3/loop_wrap = true
tracks/3/imported = false tracks/3/imported = false
tracks/3/enabled = true tracks/3/enabled = true
tracks/3/keys = { tracks/3/keys = {
"times": PoolRealArray( 0, 3 ), "times": PackedFloat32Array( 0, 3 ),
"transitions": PoolRealArray( 1, 1 ), "transitions": PackedFloat32Array( 1, 1 ),
"update": 1, "update": 1,
"values": [ true, false ] "values": [ true, false ]
} }
@@ -166,8 +166,8 @@ tracks/4/loop_wrap = true
tracks/4/imported = false tracks/4/imported = false
tracks/4/enabled = true tracks/4/enabled = true
tracks/4/keys = { tracks/4/keys = {
"times": PoolRealArray( 0, 3 ), "times": PackedFloat32Array( 0, 3 ),
"transitions": PoolRealArray( 1, 1 ), "transitions": PackedFloat32Array( 1, 1 ),
"update": 1, "update": 1,
"values": [ false, true ] "values": [ false, true ]
} }
@@ -178,8 +178,8 @@ tracks/5/loop_wrap = true
tracks/5/imported = false tracks/5/imported = false
tracks/5/enabled = true tracks/5/enabled = true
tracks/5/keys = { tracks/5/keys = {
"times": PoolRealArray( 0, 3.5, 4.5 ), "times": PackedFloat32Array( 0, 3.5, 4.5 ),
"transitions": PoolRealArray( 1, 1, 1 ), "transitions": PackedFloat32Array( 1, 1, 1 ),
"update": 0, "update": 0,
"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ] "values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
} }
@@ -190,8 +190,8 @@ tracks/6/loop_wrap = true
tracks/6/imported = false tracks/6/imported = false
tracks/6/enabled = true tracks/6/enabled = true
tracks/6/keys = { tracks/6/keys = {
"times": PoolRealArray( 0 ), "times": PackedFloat32Array( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PackedFloat32Array( 1 ),
"update": 0, "update": 0,
"values": [ Color( 1, 1, 1, 1 ) ] "values": [ Color( 1, 1, 1, 1 ) ]
} }
@@ -202,8 +202,8 @@ tracks/7/loop_wrap = true
tracks/7/imported = false tracks/7/imported = false
tracks/7/enabled = true tracks/7/enabled = true
tracks/7/keys = { tracks/7/keys = {
"times": PoolRealArray( 0, 3, 3.5, 5 ), "times": PackedFloat32Array( 0, 3, 3.5, 5 ),
"transitions": PoolRealArray( 1, 1, 1, 1 ), "transitions": PackedFloat32Array( 1, 1, 1, 1 ),
"update": 0, "update": 0,
"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ] "values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
} }
@@ -214,8 +214,8 @@ tracks/8/loop_wrap = true
tracks/8/imported = false tracks/8/imported = false
tracks/8/enabled = true tracks/8/enabled = true
tracks/8/keys = { tracks/8/keys = {
"times": PoolRealArray( 0 ), "times": PackedFloat32Array( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PackedFloat32Array( 1 ),
"update": 0, "update": 0,
"values": [ Vector2( 620, 450 ) ] "values": [ Vector2( 620, 450 ) ]
} }
@@ -226,8 +226,8 @@ tracks/9/loop_wrap = true
tracks/9/imported = false tracks/9/imported = false
tracks/9/enabled = true tracks/9/enabled = true
tracks/9/keys = { tracks/9/keys = {
"times": PoolRealArray( 0 ), "times": PackedFloat32Array( 0 ),
"transitions": PoolRealArray( 1 ), "transitions": PackedFloat32Array( 1 ),
"update": 1, "update": 1,
"values": [ true ] "values": [ true ]
} }
@@ -239,19 +239,19 @@ esc_script = "res://gymkhana/rooms/intro/esc/intro.esc"
camera_limits = [ Rect2( 0, 0, 1920, 1080 ) ] camera_limits = [ Rect2( 0, 0, 1920, 1080 ) ]
[node name="ESCBackground" type="TextureRect" parent="."] [node name="ESCBackground" type="TextureRect" parent="."]
margin_right = 1279.0 offset_right = 1279.0
margin_bottom = 900.0 offset_bottom = 900.0
mouse_filter = 2 mouse_filter = 2
texture = ExtResource( 4 ) texture = ExtResource( 4 )
expand = true expand = true
stretch_mode = 1 stretch_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
[node name="IntroBackgroundSpace" type="Sprite" parent="."] [node name="IntroBackgroundSpace" type="Sprite2D" parent="."]
position = Vector2( 641, 451 ) position = Vector2( 641, 451 )
texture = ExtResource( 7 ) texture = ExtResource( 7 )
[node name="animated_asteroid" type="AnimatedSprite" parent="."] [node name="animated_asteroid" type="AnimatedSprite2D" parent="."]
visible = false visible = false
position = Vector2( 630, 471 ) position = Vector2( 630, 471 )
frames = SubResource( 7 ) frames = SubResource( 7 )
@@ -259,16 +259,16 @@ frames = SubResource( 7 )
[node name="Polygon2D" type="Polygon2D" parent="."] [node name="Polygon2D" type="Polygon2D" parent="."]
modulate = Color( 1, 1, 1, 0 ) modulate = Color( 1, 1, 1, 0 )
position = Vector2( 0, 2 ) position = Vector2( 0, 2 )
polygon = PoolVector2Array( 0, 0, 1280, 0, 1280, 900, 0, 900 ) polygon = PackedVector2Array( 0, 0, 1280, 0, 1280, 900, 0, 900 )
[node name="asteroid" type="Sprite" parent="."] [node name="asteroid" type="Sprite2D" parent="."]
visible = false visible = false
modulate = Color( 1, 1, 1, 0 ) modulate = Color( 1, 1, 1, 0 )
position = Vector2( 620, 450 ) position = Vector2( 620, 450 )
texture = ExtResource( 6 ) texture = ExtResource( 6 )
[node name="ESCItem" type="Area2D" parent="."] [node name="ESCItem" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
script = ExtResource( 3 ) script = ExtResource( 3 )
global_id = "intro_animation_player" global_id = "intro_animation_player"
combine_when_selected_action_is_in = [ ] combine_when_selected_action_is_in = [ ]

View File

@@ -2,35 +2,35 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2] [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/background.png" type="Texture" id=3] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/background.png" type="Texture2D" id=3]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/depth.png" type="Texture" id=7] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/depth.png" type="Texture2D" id=7]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-mesa.png" type="Texture" id=8] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-mesa.png" type="Texture2D" id=8]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png" type="Texture" id=9] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png" type="Texture2D" id=9]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_peso.tscn" type="PackedScene" id=10] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_peso.tscn" type="PackedScene" id=10]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_bol.tscn" type="PackedScene" id=11] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_bol.tscn" type="PackedScene" id=11]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_llena.tscn" type="PackedScene" id=12] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_llena.tscn" type="PackedScene" id=12]
[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" type="Texture" id=13] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_patata.png" type="Texture2D" id=13]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn" type="PackedScene" id=14] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn" type="PackedScene" id=14]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-apagado.png" type="Texture" id=15] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-apagado.png" type="Texture2D" id=15]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido3.png" type="Texture" id=16] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido3.png" type="Texture2D" id=16]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido1.png" type="Texture" id=17] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido1.png" type="Texture2D" id=17]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido2.png" type="Texture" id=18] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido2.png" type="Texture2D" id=18]
[ext_resource path="res://gymkhana/particles/SmokeParticles.tscn" type="PackedScene" id=19] [ext_resource path="res://gymkhana/particles/SmokeParticles.tscn" type="PackedScene" id=19]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_cuerno.tscn" type="PackedScene" id=20] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_cuerno.tscn" type="PackedScene" id=20]
[ext_resource path="res://gymkhana/items/inventory/scripts/turno_cocina_sin_olla_economica_encendida_observer.gd" type="Script" id=21] [ext_resource path="res://gymkhana/items/inventory/scripts/turno_cocina_sin_olla_economica_encendida_observer.gd" type="Script" id=21]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/jarra.tscn" type="PackedScene" id=22] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/jarra.tscn" type="PackedScene" id=22]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra.png" type="Texture" id=23] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra.png" type="Texture2D" id=23]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" type="Texture" id=24] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" type="Texture2D" id=24]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn" type="PackedScene" id=25] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/jarra_volcada.tscn" type="PackedScene" id=25]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd" type="Script" id=26] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/cocina_gas.gd" type="Script" id=26]
[sub_resource type="NavigationPolygon" id=3] [sub_resource type="NavigationPolygon" id=3]
vertices = PoolVector2Array( 2398, 485, 2442, 499, 2446, 617, 2409, 597, 2283, 493, 144, 568, 3, 570, -56, 524, 111, 445, 162, 471, 229, 445, 200, 465, 252, 478, 305, 524, 273, 570, 2287, 687, 2062, 635, 2113, 565, 696, 737, 512, 591, 703, 699, 1269, 739, 1241, 699, 1502, 646, 1409, 752, 1345, 667, 1489, 627, 1347, 563, 1480, 587, 1466, 514, 1345, 505, 1382, 439, 2109, 424, 2238, 386, 1788, 325, 2018, 419, 1787, 383, 1466, 412, 1493, 479, 1305.5, 467, 1337.5, 449, 1306.5, 498 ) vertices = PackedVector2Array( 2398, 485, 2442, 499, 2446, 617, 2409, 597, 2283, 493, 144, 568, 3, 570, -56, 524, 111, 445, 162, 471, 229, 445, 200, 465, 252, 478, 305, 524, 273, 570, 2287, 687, 2062, 635, 2113, 565, 696, 737, 512, 591, 703, 699, 1269, 739, 1241, 699, 1502, 646, 1409, 752, 1345, 667, 1489, 627, 1347, 563, 1480, 587, 1466, 514, 1345, 505, 1382, 439, 2109, 424, 2238, 386, 1788, 325, 2018, 419, 1787, 383, 1466, 412, 1493, 479, 1305.5, 467, 1337.5, 449, 1306.5, 498 )
polygons = [ PoolIntArray( 0, 1, 2, 3, 4 ), PoolIntArray( 5, 6, 7, 8, 9 ), PoolIntArray( 9, 8, 10, 11 ), PoolIntArray( 12, 11, 10 ), PoolIntArray( 12, 10, 13 ), PoolIntArray( 14, 12, 13 ), PoolIntArray( 15, 16, 17, 4, 3 ), PoolIntArray( 18, 14, 13, 19, 20 ), PoolIntArray( 21, 18, 20, 22 ), PoolIntArray( 23, 24, 21, 22, 25, 26 ), PoolIntArray( 26, 25, 27, 28 ), PoolIntArray( 29, 28, 27, 30, 31 ), PoolIntArray( 4, 17, 32, 33 ), PoolIntArray( 34, 33, 32, 35, 36 ), PoolIntArray( 37, 34, 36, 38, 31 ), PoolIntArray( 31, 38, 29 ), PoolIntArray( 39, 40, 31, 30, 41 ) ] polygons = [ PackedInt32Array( 0, 1, 2, 3, 4 ), PackedInt32Array( 5, 6, 7, 8, 9 ), PackedInt32Array( 9, 8, 10, 11 ), PackedInt32Array( 12, 11, 10 ), PackedInt32Array( 12, 10, 13 ), PackedInt32Array( 14, 12, 13 ), PackedInt32Array( 15, 16, 17, 4, 3 ), PackedInt32Array( 18, 14, 13, 19, 20 ), PackedInt32Array( 21, 18, 20, 22 ), PackedInt32Array( 23, 24, 21, 22, 25, 26 ), PackedInt32Array( 26, 25, 27, 28 ), PackedInt32Array( 29, 28, 27, 30, 31 ), PackedInt32Array( 4, 17, 32, 33 ), PackedInt32Array( 34, 33, 32, 35, 36 ), PackedInt32Array( 37, 34, 36, 38, 31 ), PackedInt32Array( 31, 38, 29 ), PackedInt32Array( 39, 40, 31, 30, 41 ) ]
outlines = [ PoolVector2Array( 1347, 563, 1345, 505, 1306.5, 498, 1305.5, 467, 1337.5, 449, 1382, 439, 1466, 412, 1788, 325, 2238, 386, 2283, 493, 2398, 485, 2442, 499, 2446, 617, 2409, 597, 2287, 687, 2062, 635, 2113, 565, 2109, 424, 2018, 419, 1787, 383, 1493, 479, 1466, 514, 1480, 587, 1489, 627, 1502, 646, 1409, 752, 1269, 739, 696, 737, 273, 570, 252, 478, 200, 465, 162, 471, 144, 568, 3, 570, -56, 524, 111, 445, 229, 445, 305, 524, 512, 591, 703, 699, 1241, 699, 1345, 667 ) ] outlines = [ PackedVector2Array( 1347, 563, 1345, 505, 1306.5, 498, 1305.5, 467, 1337.5, 449, 1382, 439, 1466, 412, 1788, 325, 2238, 386, 2283, 493, 2398, 485, 2442, 499, 2446, 617, 2409, 597, 2287, 687, 2062, 635, 2113, 565, 2109, 424, 2018, 419, 1787, 383, 1493, 479, 1466, 514, 1480, 587, 1489, 627, 1502, 646, 1409, 752, 1269, 739, 696, 737, 273, 570, 252, 478, 200, 465, 162, 471, 144, 568, 3, 570, -56, 524, 111, 445, 229, 445, 305, 524, 512, 591, 703, 699, 1241, 699, 1345, 667 ) ]
[sub_resource type="SpriteFrames" id=4] [sub_resource type="SpriteFrames" id=4]
animations = [ { animations = [ {
@@ -56,7 +56,7 @@ player_scene = ExtResource( 2 )
camera_limits = [ Rect2( 0, 0, 2925, 577 ) ] camera_limits = [ Rect2( 0, 0, 2925, 577 ) ]
editor_debug_mode = 1 editor_debug_mode = 1
[node name="background" type="Sprite" parent="."] [node name="background" type="Sprite2D" parent="."]
position = Vector2( 1462.5, 289 ) position = Vector2( 1462.5, 289 )
texture = ExtResource( 3 ) texture = ExtResource( 3 )
__meta__ = { __meta__ = {
@@ -71,21 +71,21 @@ scale_max = 1.4
player_speed_multiplier = 1.2 player_speed_multiplier = 1.2
player_doubleclick_speed_multiplier = 2.0 player_doubleclick_speed_multiplier = 2.0
[node name="Foreground-mesa" type="Sprite" parent="ESCTerrain"] [node name="Foreground-mesa" type="Sprite2D" parent="ESCTerrain"]
position = Vector2( 1786, 424 ) position = Vector2( 1786, 424 )
z_index = 1000 z_index = 1000
texture = ExtResource( 8 ) texture = ExtResource( 8 )
[node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="ESCTerrain"] [node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain"]
navpoly = SubResource( 3 ) navigation_polygon = SubResource( 3 )
[node name="Foreground-silla" type="Sprite" parent="ESCTerrain/NavigationPolygonInstance"] [node name="Foreground-silla" type="Sprite2D" parent="ESCTerrain/NavigationRegion2D"]
position = Vector2( 202, 499 ) position = Vector2( 202, 499 )
z_index = 4096 z_index = 4096
texture = ExtResource( 9 ) texture = ExtResource( 9 )
[node name="puerta_detras" type="Area2D" parent="."] [node name="puerta_detras" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
position = Vector2( 302.5, 0 ) position = Vector2( 302.5, 0 )
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "cocina_puerta_detras" global_id = "cocina_puerta_detras"
@@ -102,15 +102,15 @@ animations = null
[node name="puerta_detras_collision" type="CollisionPolygon2D" parent="puerta_detras"] [node name="puerta_detras_collision" type="CollisionPolygon2D" parent="puerta_detras"]
position = Vector2( 1710, -167 ) position = Vector2( 1710, -167 )
scale = Vector2( 0.963362, 0.9875 ) scale = Vector2( 0.963362, 0.9875 )
polygon = PoolVector2Array( 30.1029, 490.127, 25.9508, 330.127, 78.8904, 318.987, 127.678, 327.089, 130.792, 486.076 ) polygon = PackedVector2Array( 30.1029, 490.127, 25.9508, 330.127, 78.8904, 318.987, 127.678, 327.089, 130.792, 486.076 )
[node name="puerta_detras_start" type="Position2D" parent="puerta_detras"] [node name="puerta_detras_start" type="Marker2D" parent="puerta_detras"]
position = Vector2( 1791, 370 ) position = Vector2( 1791, 370 )
script = ExtResource( 5 ) script = ExtResource( 5 )
global_id = "puerta_detras_start" global_id = "puerta_detras_start"
[node name="puerta_delante" type="Area2D" parent="."] [node name="puerta_delante" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
position = Vector2( 302.5, 0 ) position = Vector2( 302.5, 0 )
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "cocina_puerta_delante" global_id = "cocina_puerta_delante"
@@ -127,9 +127,9 @@ animations = null
[node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"] [node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"]
position = Vector2( 2385, -81 ) position = Vector2( 2385, -81 )
scale = Vector2( 0.963362, 0.9875 ) scale = Vector2( 0.963362, 0.9875 )
polygon = PoolVector2Array( 44.1165, 551.899, 44.1165, 541.772, 38.9263, 515.443, 36.8501, 487.089, 25.4319, 459.747, 7.7854, 437.468, 10.3804, 161.013, 124.564, 97.2152, 120.751, 208.793, 108.474, 210.633, 104.322, 228.861, 105.36, 255.19, 109.512, 271.392, 114.703, 279.494, 106.398, 457.721, 103.284, 469.873, 83.5615, 487.089, 70.0671, 524.557, 59.6868, 555.949 ) polygon = PackedVector2Array( 44.1165, 551.899, 44.1165, 541.772, 38.9263, 515.443, 36.8501, 487.089, 25.4319, 459.747, 7.7854, 437.468, 10.3804, 161.013, 124.564, 97.2152, 120.751, 208.793, 108.474, 210.633, 104.322, 228.861, 105.36, 255.19, 109.512, 271.392, 114.703, 279.494, 106.398, 457.721, 103.284, 469.873, 83.5615, 487.089, 70.0671, 524.557, 59.6868, 555.949 )
[node name="puerta_delante_start" type="Position2D" parent="puerta_delante"] [node name="puerta_delante_start" type="Marker2D" parent="puerta_delante"]
position = Vector2( 2379, 526 ) position = Vector2( 2379, 526 )
script = ExtResource( 5 ) script = ExtResource( 5 )
global_id = "puerta_delante_start" global_id = "puerta_delante_start"
@@ -140,9 +140,9 @@ scale = Vector2( 0.880435, 0.88735 )
[node name="turno_cocina_peso_collision" type="CollisionPolygon2D" parent="turno_cocina_peso"] [node name="turno_cocina_peso_collision" type="CollisionPolygon2D" parent="turno_cocina_peso"]
position = Vector2( 15.9014, -11.2695 ) position = Vector2( 15.9014, -11.2695 )
polygon = PoolVector2Array( -2.27197, 1.12694, -2.27197, 23.666, -27.2595, 24.7929, -27.2595, 1.12694 ) polygon = PackedVector2Array( -2.27197, 1.12694, -2.27197, 23.666, -27.2595, 24.7929, -27.2595, 1.12694 )
[node name="turno_cocina_peso_location" type="Position2D" parent="turno_cocina_peso"] [node name="turno_cocina_peso_location" type="Marker2D" parent="turno_cocina_peso"]
position = Vector2( -3.40724, 268.214 ) position = Vector2( -3.40724, 268.214 )
script = ExtResource( 5 ) script = ExtResource( 5 )
@@ -152,9 +152,9 @@ scale = Vector2( 0.880435, 0.88735 )
[node name="turno_cocina_bol_collision" type="CollisionPolygon2D" parent="turno_cocina_bol"] [node name="turno_cocina_bol_collision" type="CollisionPolygon2D" parent="turno_cocina_bol"]
position = Vector2( 169.235, 210.74 ) position = Vector2( 169.235, 210.74 )
polygon = PoolVector2Array( -7.95056, -30.4277, -4.54321, 21.412, -56.79, 37.1894, -73.827, -13.5234 ) polygon = PackedVector2Array( -7.95056, -30.4277, -4.54321, 21.412, -56.79, 37.1894, -73.827, -13.5234 )
[node name="turno_cocina_bol_location" type="Position2D" parent="turno_cocina_bol"] [node name="turno_cocina_bol_location" type="Marker2D" parent="turno_cocina_bol"]
position = Vector2( 198.765, 339.212 ) position = Vector2( 198.765, 339.212 )
script = ExtResource( 5 ) script = ExtResource( 5 )
@@ -174,14 +174,14 @@ custom_data = {
[node name="turno_cocina_pan_collision" type="CollisionPolygon2D" parent="turno_cocina_pan"] [node name="turno_cocina_pan_collision" type="CollisionPolygon2D" parent="turno_cocina_pan"]
position = Vector2( 590.712, 122.292 ) position = Vector2( 590.712, 122.292 )
scale = Vector2( 1.02084, 1.32813 ) scale = Vector2( 1.02084, 1.32813 )
polygon = PoolVector2Array( -14.7654, -1.12695, -14.7654, 7.88867, -48.8394, 7.88867, -48.8394, -1.12695 ) polygon = PackedVector2Array( -14.7654, -1.12695, -14.7654, 7.88867, -48.8394, 7.88867, -48.8394, -1.12695 )
[node name="turno_cocina_pan_location" type="Position2D" parent="turno_cocina_pan"] [node name="turno_cocina_pan_location" type="Marker2D" parent="turno_cocina_pan"]
position = Vector2( 603.111, 223.136 ) position = Vector2( 603.111, 223.136 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="fregadero_der" type="Area2D" parent="."] [node name="fregadero_der" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "cocina_fregadero_der" global_id = "cocina_fregadero_der"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc"
@@ -200,14 +200,14 @@ target_when_selected_action_is_in = [ "action3" ]
animations = null animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_der"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_der"]
polygon = PoolVector2Array( 2327, 294, 2327, 302, 2395, 307, 2395, 296, 2401, 290, 2401, 257, 2334, 257, 2334, 286 ) polygon = PackedVector2Array( 2327, 294, 2327, 302, 2395, 307, 2395, 296, 2401, 290, 2401, 257, 2334, 257, 2334, 286 )
[node name="ESCLocation" type="Position2D" parent="fregadero_der"] [node name="ESCLocation" type="Marker2D" parent="fregadero_der"]
position = Vector2( 2370, 395 ) position = Vector2( 2370, 395 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="fregadero_izq" type="Area2D" parent="."] [node name="fregadero_izq" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "cocina_fregadero_izq" global_id = "cocina_fregadero_izq"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc"
@@ -226,14 +226,14 @@ target_when_selected_action_is_in = [ "action3" ]
animations = null animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_izq"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_izq"]
polygon = PoolVector2Array( 1806, 295, 1899, 287, 1900, 268, 1891, 245, 1851, 244, 1799, 240, 1798, 273 ) polygon = PackedVector2Array( 1806, 295, 1899, 287, 1900, 268, 1891, 245, 1851, 244, 1799, 240, 1798, 273 )
[node name="ESCLocation" type="Position2D" parent="fregadero_izq"] [node name="ESCLocation" type="Marker2D" parent="fregadero_izq"]
position = Vector2( 1855, 400 ) position = Vector2( 1855, 400 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="cuchillos" type="Area2D" parent="."] [node name="cuchillos" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "cocina_cuchillos" global_id = "cocina_cuchillos"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cuchillos.esc" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cuchillos.esc"
@@ -252,14 +252,14 @@ animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cuchillos"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cuchillos"]
position = Vector2( 1452, -245 ) position = Vector2( 1452, -245 )
polygon = PoolVector2Array( 469, 375, 454, 391, 508, 399, 530, 385 ) polygon = PackedVector2Array( 469, 375, 454, 391, 508, 399, 530, 385 )
[node name="ESCLocation" type="Position2D" parent="cuchillos"] [node name="ESCLocation" type="Marker2D" parent="cuchillos"]
position = Vector2( 1987, 370 ) position = Vector2( 1987, 370 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="debajo_sofa" type="Area2D" parent="."] [node name="debajo_sofa" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "cocina_debajo_sofa" global_id = "cocina_debajo_sofa"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc"
@@ -277,14 +277,14 @@ target_when_selected_action_is_in = [ "action3" ]
animations = null animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="debajo_sofa"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="debajo_sofa"]
polygon = PoolVector2Array( 466, 382, 464, 421, 556, 423, 551, 415, 550, 409, 561, 386 ) polygon = PackedVector2Array( 466, 382, 464, 421, 556, 423, 551, 415, 550, 409, 561, 386 )
[node name="ESCLocation" type="Position2D" parent="debajo_sofa"] [node name="ESCLocation" type="Marker2D" parent="debajo_sofa"]
position = Vector2( 420, 494 ) position = Vector2( 420, 494 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="cocina_patata" type="Area2D" parent="."] [node name="cocina_patata" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
position = Vector2( 2202, 343 ) position = Vector2( 2202, 343 )
rotation = -0.270526 rotation = -0.270526
scale = Vector2( 0.65, 0.65 ) scale = Vector2( 0.65, 0.65 )
@@ -315,7 +315,7 @@ custom_data = {
} }
animations = null animations = null
[node name="Sprite" type="Sprite" parent="cocina_patata"] [node name="Sprite2D" type="Sprite2D" parent="cocina_patata"]
position = Vector2( -2, 0 ) position = Vector2( -2, 0 )
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 13 ) texture = ExtResource( 13 )
@@ -323,14 +323,14 @@ texture = ExtResource( 13 )
[node name="turno_cocina_patata_collision" type="CollisionPolygon2D" parent="cocina_patata"] [node name="turno_cocina_patata_collision" type="CollisionPolygon2D" parent="cocina_patata"]
position = Vector2( 9.0867, -13.5233 ) position = Vector2( 9.0867, -13.5233 )
z_index = 1001 z_index = 1001
polygon = PoolVector2Array( 1.61475, 3.71887, 8.86548, 12.1157, 5.32715, 19.1171, -2.24731, 23.4026, -16.8235, 24.1499, -29.7551, 18.9672, -29.593, 12.626, -23.5007, 7.92932, -14.0325, 2.57251 ) polygon = PackedVector2Array( 1.61475, 3.71887, 8.86548, 12.1157, 5.32715, 19.1171, -2.24731, 23.4026, -16.8235, 24.1499, -29.7551, 18.9672, -29.593, 12.626, -23.5007, 7.92932, -14.0325, 2.57251 )
[node name="turno_cocina_patata_location" type="Position2D" parent="cocina_patata"] [node name="turno_cocina_patata_location" type="Marker2D" parent="cocina_patata"]
position = Vector2( 93.1357, 65.3632 ) position = Vector2( 93.1357, 65.3632 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="turno_cocina_economica" type="Area2D" parent="."] [node name="turno_cocina_economica" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
position = Vector2( 1299, 506 ) position = Vector2( 1299, 506 )
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "turno_cocina_economica" global_id = "turno_cocina_economica"
@@ -354,9 +354,9 @@ animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_economica"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_economica"]
position = Vector2( -6, -4 ) position = Vector2( -6, -4 )
polygon = PoolVector2Array( -65, -18, -138, 48, -37, 73, 226, 71, 253, -5 ) polygon = PackedVector2Array( -65, -18, -138, 48, -37, 73, 226, 71, 253, -5 )
[node name="ESCLocation" type="Position2D" parent="turno_cocina_economica"] [node name="ESCLocation" type="Marker2D" parent="turno_cocina_economica"]
position = Vector2( -182, 205 ) position = Vector2( -182, 205 )
script = ExtResource( 5 ) script = ExtResource( 5 )
@@ -371,15 +371,15 @@ custom_data = {
} }
} }
[node name="ESCLocation" type="Position2D" parent="turno_cocina_libro_de_cocina"] [node name="ESCLocation" type="Marker2D" parent="turno_cocina_libro_de_cocina"]
position = Vector2( -16.9304, 145.789 ) position = Vector2( -16.9304, 145.789 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_libro_de_cocina"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_libro_de_cocina"]
polygon = PoolVector2Array( -44.207, -15.9898, -44.207, 23.5143, 41.3853, 22.5738, 42.3259, 10.3463, 56.4346, 10.3463, 55.4939, 2.82172, 63.959, 1.88113, 63.0186, -16.9304 ) polygon = PackedVector2Array( -44.207, -15.9898, -44.207, 23.5143, 41.3853, 22.5738, 42.3259, 10.3463, 56.4346, 10.3463, 55.4939, 2.82172, 63.959, 1.88113, 63.0186, -16.9304 )
[node name="turno_cocina_cocina_gas" type="Area2D" parent="."] [node name="turno_cocina_cocina_gas" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
position = Vector2( 2219, 272 ) position = Vector2( 2219, 272 )
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "turno_cocina_cocina_gas" global_id = "turno_cocina_cocina_gas"
@@ -403,9 +403,9 @@ animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_cocina_gas"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_cocina_gas"]
position = Vector2( 2, -33 ) position = Vector2( 2, -33 )
z_index = 5 z_index = 5
polygon = PoolVector2Array( -17, 4, -18, 29, -32, 33, -32, 43, 6, 44, 6, 24, 18, 24, 18, 18, 39, 18, 40, 5 ) polygon = PackedVector2Array( -17, 4, -18, 29, -32, 33, -32, 43, 6, 44, 6, 24, 18, 24, 18, 18, 39, 18, 40, 5 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="turno_cocina_cocina_gas"] [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="turno_cocina_cocina_gas"]
position = Vector2( 7, -8 ) position = Vector2( 7, -8 )
z_as_relative = false z_as_relative = false
frames = SubResource( 4 ) frames = SubResource( 4 )
@@ -413,7 +413,7 @@ animation = "apagada"
playing = true playing = true
script = ExtResource( 26 ) script = ExtResource( 26 )
[node name="ESCLocation" type="Position2D" parent="turno_cocina_cocina_gas"] [node name="ESCLocation" type="Marker2D" parent="turno_cocina_cocina_gas"]
position = Vector2( -56, 78 ) position = Vector2( -56, 78 )
script = ExtResource( 5 ) script = ExtResource( 5 )
@@ -422,14 +422,14 @@ visible = false
position = Vector2( 1281, 491 ) position = Vector2( 1281, 491 )
scale = Vector2( 1.06318, 1.06318 ) scale = Vector2( 1.06318, 1.06318 )
[node name="ESCLocation" type="Position2D" parent="turno_cocina_olla_llena"] [node name="ESCLocation" type="Marker2D" parent="turno_cocina_olla_llena"]
position = Vector2( -160.838, 201.283 ) position = Vector2( -160.838, 201.283 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="turno_cocina_cuerno" parent="." instance=ExtResource( 20 )] [node name="turno_cocina_cuerno" parent="." instance=ExtResource( 20 )]
position = Vector2( 2801, 175 ) position = Vector2( 2801, 175 )
[node name="ESCLocation" type="Position2D" parent="turno_cocina_cuerno"] [node name="ESCLocation" type="Marker2D" parent="turno_cocina_cuerno"]
position = Vector2( -81, 334 ) position = Vector2( -81, 334 )
script = ExtResource( 5 ) script = ExtResource( 5 )
@@ -446,9 +446,9 @@ inventory_texture = ExtResource( 23 )
[node name="turno_cocina_jarra_collision" type="CollisionPolygon2D" parent="turno_cocina_jarra"] [node name="turno_cocina_jarra_collision" type="CollisionPolygon2D" parent="turno_cocina_jarra"]
position = Vector2( 15.9011, -12.3964 ) position = Vector2( 15.9011, -12.3964 )
polygon = PoolVector2Array( -4.54248, 1.12698, -11.3574, 24.793, -27.2595, 24.7929, -27.2595, 1.12694 ) polygon = PackedVector2Array( -4.54248, 1.12698, -11.3574, 24.793, -27.2595, 24.7929, -27.2595, 1.12694 )
[node name="turno_cocina_jarra_location" type="Position2D" parent="turno_cocina_jarra"] [node name="turno_cocina_jarra_location" type="Marker2D" parent="turno_cocina_jarra"]
position = Vector2( -55.6546, 169.043 ) position = Vector2( -55.6546, 169.043 )
script = ExtResource( 5 ) script = ExtResource( 5 )
@@ -460,8 +460,8 @@ inventory_texture = ExtResource( 24 )
[node name="turno_cocina_jarra_volcada_collision" type="CollisionPolygon2D" parent="turno_cocina_jarra_volcada"] [node name="turno_cocina_jarra_volcada_collision" type="CollisionPolygon2D" parent="turno_cocina_jarra_volcada"]
position = Vector2( 18.1726, -12.3964 ) position = Vector2( 18.1726, -12.3964 )
polygon = PoolVector2Array( -4.54272, 12.3965, -6.81445, 16.9043, -14.7651, 19.1582, -20.4441, 22.539, -29.5305, 20.2851, -29.5305, 9.01559, -17.0366, 2.25391 ) polygon = PackedVector2Array( -4.54272, 12.3965, -6.81445, 16.9043, -14.7651, 19.1582, -20.4441, 22.539, -29.5305, 20.2851, -29.5305, 9.01559, -17.0366, 2.25391 )
[node name="turno_cocina_jarra_volcada_location" type="Position2D" parent="turno_cocina_jarra_volcada"] [node name="turno_cocina_jarra_volcada_location" type="Marker2D" parent="turno_cocina_jarra_volcada"]
position = Vector2( 45.4321, 92.4099 ) position = Vector2( 45.4321, 92.4099 )
script = ExtResource( 5 ) script = ExtResource( 5 )

View File

@@ -1,4 +1,4 @@
extends AnimatedSprite extends AnimatedSprite2D
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
func _process(_delta): func _process(_delta):

View File

@@ -1,10 +1,10 @@
[gd_scene load_steps=4 format=2] [gd_scene load_steps=4 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra.png" type="Texture" id=2] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra.png" type="Texture2D" id=2]
[node name="turno_cocina_jarra" type="Area2D"] [node name="turno_cocina_jarra" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_jarra" global_id = "turno_cocina_jarra"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/jarra.esc" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/jarra.esc"
@@ -18,7 +18,7 @@ custom_data = {
} }
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
rotation = -0.0698132 rotation = -0.0698132
scale = Vector2( 0.18, 0.18 ) scale = Vector2( 0.18, 0.18 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )

View File

@@ -1,10 +1,10 @@
[gd_scene load_steps=4 format=2] [gd_scene load_steps=4 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" type="Texture" id=2] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/jarra_volcada.png" type="Texture2D" id=2]
[node name="turno_cocina_jarra_volcada" type="Area2D"] [node name="turno_cocina_jarra_volcada" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "turno_cocina_jarra_volcada" global_id = "turno_cocina_jarra_volcada"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/jarra_volcada.esc" esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/jarra_volcada.esc"
@@ -18,7 +18,7 @@ custom_data = {
} }
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
rotation = -0.0698132 rotation = -0.0698132
scale = Vector2( 0.18, 0.18 ) scale = Vector2( 0.18, 0.18 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )

View File

@@ -2,21 +2,21 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2] [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png" type="Texture" id=3] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png" type="Texture2D" id=3]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/depth.png" type="Texture" id=7] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/depth.png" type="Texture2D" id=7]
[ext_resource path="res://gymkhana/characters/eneko/eneko_smoking.tscn" type="PackedScene" id=8] [ext_resource path="res://gymkhana/characters/eneko/eneko_smoking.tscn" type="PackedScene" id=8]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png" type="Texture" id=9] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png" type="Texture2D" id=9]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_madera.tscn" type="PackedScene" id=10] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_madera.tscn" type="PackedScene" id=10]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_ajo.tscn" type="PackedScene" id=11] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_ajo.tscn" type="PackedScene" id=11]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_carton.tscn" type="PackedScene" id=12] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_carton.tscn" type="PackedScene" id=12]
[sub_resource type="NavigationPolygon" id=1] [sub_resource type="NavigationPolygon" id=1]
vertices = PoolVector2Array( -768, 301, -1163, 462, -1161, 358, -532, 166, 676, 59, 651, -8, 720, -10, 760, 50, 167, 278, 419, 146, 36, 211, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166 ) vertices = PackedVector2Array( -768, 301, -1163, 462, -1161, 358, -532, 166, 676, 59, 651, -8, 720, -10, 760, 50, 167, 278, 419, 146, 36, 211, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166 )
polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6, 7 ), PoolIntArray( 4, 7, 8, 9 ), PoolIntArray( 10, 9, 8 ), PoolIntArray( 11, 10, 8, 0, 12 ), PoolIntArray( 11, 13, 14, 10 ), PoolIntArray( 12, 0, 3, 15 ) ] polygons = [ PackedInt32Array( 0, 1, 2, 3 ), PackedInt32Array( 4, 5, 6, 7 ), PackedInt32Array( 4, 7, 8, 9 ), PackedInt32Array( 10, 9, 8 ), PackedInt32Array( 11, 10, 8, 0, 12 ), PackedInt32Array( 11, 13, 14, 10 ), PackedInt32Array( 12, 0, 3, 15 ) ]
outlines = [ PoolVector2Array( -1161, 358, -532, 166, -360, 166, -236, 229, -86, 216, -87, 153, 22, 154, 36, 211, 419, 146, 676, 59, 651, -8, 720, -10, 760, 50, 167, 278, -768, 301, -1163, 462 ) ] outlines = [ PackedVector2Array( -1161, 358, -532, 166, -360, 166, -236, 229, -86, 216, -87, 153, 22, 154, 36, 211, 419, 146, 676, 59, 651, -8, 720, -10, 760, 50, 167, 278, -768, 301, -1163, 462 ) ]
[node name="ESCRoom" type="Node2D"] [node name="ESCRoom" type="Node2D"]
script = ExtResource( 1 ) script = ExtResource( 1 )
@@ -25,7 +25,7 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delant
player_scene = ExtResource( 2 ) player_scene = ExtResource( 2 )
camera_limits = [ Rect2( 0, 0, 2319, 577 ) ] camera_limits = [ Rect2( 0, 0, 2319, 577 ) ]
[node name="background" type="Sprite" parent="."] [node name="background" type="Sprite2D" parent="."]
position = Vector2( 1159, 289 ) position = Vector2( 1159, 289 )
texture = ExtResource( 3 ) texture = ExtResource( 3 )
@@ -35,12 +35,12 @@ scales = ExtResource( 7 )
scale_min = 0.25 scale_min = 0.25
scale_max = 1.4 scale_max = 1.4
[node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="ESCTerrain"] [node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain"]
position = Vector2( 1159, 289 ) position = Vector2( 1159, 289 )
navpoly = SubResource( 1 ) navigation_polygon = SubResource( 1 )
[node name="puerta_cocina" type="Area2D" parent="."] [node name="puerta_cocina" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "cocina_delante_puerta_cocina" global_id = "cocina_delante_puerta_cocina"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina.esc" esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina.esc"
@@ -57,15 +57,15 @@ animations = null
[node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina"] [node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina"]
position = Vector2( 630, -130 ) position = Vector2( 630, -130 )
scale = Vector2( 0.963362, 0.9875 ) scale = Vector2( 0.963362, 0.9875 )
polygon = PoolVector2Array( -1.03802, 589.367, -1.03809, 311.899, 166.085, 311.899, 166.085, 589.367 ) polygon = PackedVector2Array( -1.03802, 589.367, -1.03809, 311.899, 166.085, 311.899, 166.085, 589.367 )
[node name="puerta_cocina_start" type="Position2D" parent="puerta_cocina"] [node name="puerta_cocina_start" type="Marker2D" parent="puerta_cocina"]
position = Vector2( 716, 473 ) position = Vector2( 716, 473 )
script = ExtResource( 5 ) script = ExtResource( 5 )
global_id = "puerta_cocina_start" global_id = "puerta_cocina_start"
[node name="puerta_despensa" type="Area2D" parent="."] [node name="puerta_despensa" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "cocina_delante_puerta_despensa" global_id = "cocina_delante_puerta_despensa"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_despensa.esc" esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_despensa.esc"
@@ -82,15 +82,15 @@ animations = null
[node name="puerta_despensa_collision" type="CollisionPolygon2D" parent="puerta_despensa"] [node name="puerta_despensa_collision" type="CollisionPolygon2D" parent="puerta_despensa"]
position = Vector2( 51, 113 ) position = Vector2( 51, 113 )
scale = Vector2( 0.963362, 0.9875 ) scale = Vector2( 0.963362, 0.9875 )
polygon = PoolVector2Array( -1.03803, 470.886, -1.03809, 311.899, 72.6622, 311.899, 71.6242, 469.873 ) polygon = PackedVector2Array( -1.03803, 470.886, -1.03809, 311.899, 72.6622, 311.899, 71.6242, 469.873 )
[node name="puerta_despensa_start" type="Position2D" parent="puerta_despensa"] [node name="puerta_despensa_start" type="Marker2D" parent="puerta_despensa"]
position = Vector2( 90, 621 ) position = Vector2( 90, 621 )
script = ExtResource( 5 ) script = ExtResource( 5 )
global_id = "puerta_despensa_start" global_id = "puerta_despensa_start"
[node name="puerta_detras" type="Area2D" parent="."] [node name="puerta_detras" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "cocina_delante_puerta_detras" global_id = "cocina_delante_puerta_detras"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_detras.esc" esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_detras.esc"
@@ -107,9 +107,9 @@ animations = null
[node name="puerta_detras_collision" type="CollisionPolygon2D" parent="puerta_detras"] [node name="puerta_detras_collision" type="CollisionPolygon2D" parent="puerta_detras"]
position = Vector2( 1067, -26 ) position = Vector2( 1067, -26 )
scale = Vector2( 0.963362, 0.9875 ) scale = Vector2( 0.963362, 0.9875 )
polygon = PoolVector2Array( 5.19019, 470.886, 6.22815, 359.494, -67.472, 360.506, -69.5481, 285.57, 120.412, 293.671, 122.488, 470.886 ) polygon = PackedVector2Array( 5.19019, 470.886, 6.22815, 359.494, -67.472, 360.506, -69.5481, 285.57, 120.412, 293.671, 122.488, 470.886 )
[node name="puerta_detras_start" type="Position2D" parent="puerta_detras"] [node name="puerta_detras_start" type="Marker2D" parent="puerta_detras"]
position = Vector2( 1131, 460 ) position = Vector2( 1131, 460 )
script = ExtResource( 5 ) script = ExtResource( 5 )
global_id = "puerta_detras_start" global_id = "puerta_detras_start"
@@ -117,24 +117,24 @@ global_id = "puerta_detras_start"
[node name="EnekoSmoking" parent="." instance=ExtResource( 8 )] [node name="EnekoSmoking" parent="." instance=ExtResource( 8 )]
position = Vector2( 813, 440 ) position = Vector2( 813, 440 )
[node name="ESCLocation" type="Position2D" parent="EnekoSmoking"] [node name="ESCLocation" type="Marker2D" parent="EnekoSmoking"]
position = Vector2( -44, 82 ) position = Vector2( -44, 82 )
script = ExtResource( 5 ) script = ExtResource( 5 )
global_id = "eneko_smoking" global_id = "eneko_smoking"
[node name="Foreground" type="Sprite" parent="."] [node name="Foreground" type="Sprite2D" parent="."]
position = Vector2( 1817, 451 ) position = Vector2( 1817, 451 )
z_index = 4096 z_index = 4096
texture = ExtResource( 9 ) texture = ExtResource( 9 )
[node name="new_game_start_location" type="Position2D" parent="."] [node name="new_game_start_location" type="Marker2D" parent="."]
position = Vector2( 718, 509 ) position = Vector2( 718, 509 )
script = ExtResource( 5 ) script = ExtResource( 5 )
global_id = "new_game_start_location" global_id = "new_game_start_location"
is_start_location = true is_start_location = true
[node name="pegatinas" type="Area2D" parent="."] [node name="pegatinas" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
position = Vector2( 870, 264 ) position = Vector2( 870, 264 )
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "cocina_delante_pegatinas" global_id = "cocina_delante_pegatinas"
@@ -151,9 +151,9 @@ animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="pegatinas"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="pegatinas"]
position = Vector2( -33, -25 ) position = Vector2( -33, -25 )
polygon = PoolVector2Array( -20, 43, 37, 46, 39, 87, 57, 86, 92, 84, 91, -16, 47, -17, -20, -17, -21, 26 ) polygon = PackedVector2Array( -20, 43, 37, 46, 39, 87, 57, 86, 92, 84, 91, -16, 47, -17, -20, -17, -21, 26 )
[node name="ESCLocation" type="Position2D" parent="pegatinas"] [node name="ESCLocation" type="Marker2D" parent="pegatinas"]
position = Vector2( -99, 213 ) position = Vector2( -99, 213 )
script = ExtResource( 5 ) script = ExtResource( 5 )
@@ -163,22 +163,22 @@ scale = Vector2( 0.880435, 0.88735 )
[node name="turno_cocina_madera_collision" type="CollisionPolygon2D" parent="turno_cocina_madera"] [node name="turno_cocina_madera_collision" type="CollisionPolygon2D" parent="turno_cocina_madera"]
position = Vector2( 396.395, 87.9022 ) position = Vector2( 396.395, 87.9022 )
polygon = PoolVector2Array( -2.27148, -21.4121, -2.27148, 32.6816, -77.2345, 30.4277, -78.3702, -21.4121 ) polygon = PackedVector2Array( -2.27148, -21.4121, -2.27148, 32.6816, -77.2345, 30.4277, -78.3702, -21.4121 )
[node name="turno_cocina_madera_location" type="Position2D" parent="turno_cocina_madera"] [node name="turno_cocina_madera_location" type="Marker2D" parent="turno_cocina_madera"]
position = Vector2( 368, 137.488 ) position = Vector2( 368, 137.488 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="turno_cocina_ajo" parent="." instance=ExtResource( 11 )] [node name="turno_cocina_ajo" parent="." instance=ExtResource( 11 )]
position = Vector2( 858, 399 ) position = Vector2( 858, 399 )
[node name="ESCLocation" type="Position2D" parent="turno_cocina_ajo"] [node name="ESCLocation" type="Marker2D" parent="turno_cocina_ajo"]
position = Vector2( -21, 91 ) position = Vector2( -21, 91 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="turno_cocina_carton" parent="." instance=ExtResource( 12 )] [node name="turno_cocina_carton" parent="." instance=ExtResource( 12 )]
position = Vector2( 1221, 423 ) position = Vector2( 1221, 423 )
[node name="ESCLocation" type="Position2D" parent="turno_cocina_carton"] [node name="ESCLocation" type="Marker2D" parent="turno_cocina_carton"]
position = Vector2( -52, 34 ) position = Vector2( -52, 34 )
script = ExtResource( 5 ) script = ExtResource( 5 )

View File

@@ -2,20 +2,20 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2] [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/background.jpg" type="Texture" id=3] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/background.jpg" type="Texture2D" id=3]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png" type="Texture" id=7] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png" type="Texture2D" id=7]
[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/columna.png" type="Texture" id=8] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/columna.png" type="Texture2D" id=8]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_vacia.tscn" type="PackedScene" id=9] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_vacia.tscn" type="PackedScene" id=9]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_mechero.tscn" type="PackedScene" id=10] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_mechero.tscn" type="PackedScene" id=10]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_romero.tscn" type="PackedScene" id=11] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_romero.tscn" type="PackedScene" id=11]
[sub_resource type="NavigationPolygon" id=1] [sub_resource type="NavigationPolygon" id=1]
vertices = PoolVector2Array( -1104, 183, -1146, 112, -1013, 114, -864, 131, -787, 150, -717, 189, 44, 171, 37, 137, 169, 158, 177, 170, 184, 248, 169, 316, 246, 170, 246, 233, -236, 229, -1093, 316, -598, 200, -852, 111, -790, 115, -519, 186, -392, 198 ) vertices = PackedVector2Array( -1104, 183, -1146, 112, -1013, 114, -864, 131, -787, 150, -717, 189, 44, 171, 37, 137, 169, 158, 177, 170, 184, 248, 169, 316, 246, 170, 246, 233, -236, 229, -1093, 316, -598, 200, -852, 111, -790, 115, -519, 186, -392, 198 )
polygons = [ PoolIntArray( 0, 1, 2, 3, 4, 5 ), PoolIntArray( 6, 7, 8, 9, 10, 11 ), PoolIntArray( 9, 12, 13, 10 ), PoolIntArray( 14, 11, 15, 0, 16 ), PoolIntArray( 17, 18, 4, 3 ), PoolIntArray( 14, 6, 11 ), PoolIntArray( 16, 19, 20, 14 ), PoolIntArray( 0, 5, 16 ) ] polygons = [ PackedInt32Array( 0, 1, 2, 3, 4, 5 ), PackedInt32Array( 6, 7, 8, 9, 10, 11 ), PackedInt32Array( 9, 12, 13, 10 ), PackedInt32Array( 14, 11, 15, 0, 16 ), PackedInt32Array( 17, 18, 4, 3 ), PackedInt32Array( 14, 6, 11 ), PackedInt32Array( 16, 19, 20, 14 ), PackedInt32Array( 0, 5, 16 ) ]
outlines = [ PoolVector2Array( -1146, 112, -1013, 114, -864, 131, -852, 111, -790, 115, -787, 150, -717, 189, -598, 200, -519, 186, -392, 198, -236, 229, 44, 171, 37, 137, 169, 158, 177, 170, 246, 170, 246, 233, 184, 248, 169, 316, -1093, 316, -1104, 183 ) ] outlines = [ PackedVector2Array( -1146, 112, -1013, 114, -864, 131, -852, 111, -790, 115, -787, 150, -717, 189, -598, 200, -519, 186, -392, 198, -236, 229, 44, 171, 37, 137, 169, 158, 177, 170, 246, 170, 246, 233, 184, 248, 169, 316, -1093, 316, -1104, 183 ) ]
[node name="ESCRoom" type="Node2D"] [node name="ESCRoom" type="Node2D"]
script = ExtResource( 1 ) script = ExtResource( 1 )
@@ -27,7 +27,7 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/cocina_detras.
player_scene = ExtResource( 2 ) player_scene = ExtResource( 2 )
camera_limits = [ Rect2( 0, 0, 1500, 577 ) ] camera_limits = [ Rect2( 0, 0, 1500, 577 ) ]
[node name="background" type="Sprite" parent="."] [node name="background" type="Sprite2D" parent="."]
position = Vector2( 750, 289 ) position = Vector2( 750, 289 )
texture = ExtResource( 3 ) texture = ExtResource( 3 )
__meta__ = { __meta__ = {
@@ -44,15 +44,15 @@ scale_min = 0.5
player_speed_multiplier = 1.3 player_speed_multiplier = 1.3
player_doubleclick_speed_multiplier = 2.0 player_doubleclick_speed_multiplier = 2.0
[node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="ESCTerrain"] [node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain"]
position = Vector2( 1252, 260 ) position = Vector2( 1252, 260 )
navpoly = SubResource( 1 ) navigation_polygon = SubResource( 1 )
__meta__ = { __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="puerta_cocina" type="Area2D" parent="."] [node name="puerta_cocina" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "cocina_detras_puerta_cocina" global_id = "cocina_detras_puerta_cocina"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc" esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc"
@@ -68,15 +68,15 @@ animations = null
[node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina"] [node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina"]
position = Vector2( 630, -130 ) position = Vector2( 630, -130 )
scale = Vector2( 0.963362, 0.9875 ) scale = Vector2( 0.963362, 0.9875 )
polygon = PoolVector2Array( 117.298, 581.266, 120.412, 341.266, 169.199, 325.063, 236.671, 333.165, 236.671, 588.354 ) polygon = PackedVector2Array( 117.298, 581.266, 120.412, 341.266, 169.199, 325.063, 236.671, 333.165, 236.671, 588.354 )
[node name="cocina_detras_puerta_cocina_start" type="Position2D" parent="puerta_cocina"] [node name="cocina_detras_puerta_cocina_start" type="Marker2D" parent="puerta_cocina"]
position = Vector2( 793, 465 ) position = Vector2( 793, 465 )
script = ExtResource( 5 ) script = ExtResource( 5 )
global_id = "cocina_detras_puerta_cocina_start" global_id = "cocina_detras_puerta_cocina_start"
[node name="puerta_delante" type="Area2D" parent="."] [node name="puerta_delante" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "cocina_detras_puerta_delante" global_id = "cocina_detras_puerta_delante"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_delante.esc" esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_delante.esc"
@@ -92,14 +92,14 @@ animations = null
[node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"] [node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"]
position = Vector2( 298, -203 ) position = Vector2( 298, -203 )
scale = Vector2( 0.963362, 0.9875 ) scale = Vector2( 0.963362, 0.9875 )
polygon = PoolVector2Array( 117.298, 581.266, 112.107, 422.279, 285.459, 437.468, 282.345, 486.076, 234.595, 513.418, 234.595, 582.279 ) polygon = PackedVector2Array( 117.298, 581.266, 112.107, 422.279, 285.459, 437.468, 282.345, 486.076, 234.595, 513.418, 234.595, 582.279 )
[node name="puerta_delante_start" type="Position2D" parent="puerta_delante"] [node name="puerta_delante_start" type="Marker2D" parent="puerta_delante"]
position = Vector2( 436, 381 ) position = Vector2( 436, 381 )
script = ExtResource( 5 ) script = ExtResource( 5 )
global_id = "puerta_delante_start" global_id = "puerta_delante_start"
[node name="Columna" type="Sprite" parent="."] [node name="Columna" type="Sprite2D" parent="."]
position = Vector2( 235, 294 ) position = Vector2( 235, 294 )
z_index = 400 z_index = 400
texture = ExtResource( 8 ) texture = ExtResource( 8 )
@@ -108,7 +108,7 @@ texture = ExtResource( 8 )
position = Vector2( 883, 451 ) position = Vector2( 883, 451 )
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )
[node name="ESCLocation" type="Position2D" parent="turno_cocina_olla_vacia"] [node name="ESCLocation" type="Marker2D" parent="turno_cocina_olla_vacia"]
position = Vector2( 1, 96 ) position = Vector2( 1, 96 )
script = ExtResource( 5 ) script = ExtResource( 5 )
@@ -117,23 +117,23 @@ position = Vector2( 108, 438 )
rotation = 1.44513 rotation = 1.44513
scale = Vector2( 0.4, 0.4 ) scale = Vector2( 0.4, 0.4 )
[node name="ESCLocation" type="Position2D" parent="turno_cocina_mechero"] [node name="ESCLocation" type="Marker2D" parent="turno_cocina_mechero"]
position = Vector2( 296.645, -154.035 ) position = Vector2( 296.645, -154.035 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="turno_cocina_romero" parent="." instance=ExtResource( 11 )] [node name="turno_cocina_romero" parent="." instance=ExtResource( 11 )]
position = Vector2( 61, 341 ) position = Vector2( 61, 341 )
[node name="ESCLocation" type="Position2D" parent="turno_cocina_romero"] [node name="ESCLocation" type="Marker2D" parent="turno_cocina_romero"]
position = Vector2( 89, 60 ) position = Vector2( 89, 60 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_romero"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_romero"]
position = Vector2( -61, -341 ) position = Vector2( -61, -341 )
polygon = PoolVector2Array( 75, 413, 96, 398, 97, 366, 88, 270, 12, 276, 33, 434 ) polygon = PackedVector2Array( 75, 413, 96, 398, 97, 366, 88, 270, 12, 276, 33, 434 )
[node name="mikel" type="Area2D" parent="."] [node name="mikel" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "cocina_detras_mikel" global_id = "cocina_detras_mikel"
esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/mikel.esc" esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/mikel.esc"
@@ -148,8 +148,8 @@ animations = null
[node name="mikel_collision" type="CollisionPolygon2D" parent="mikel"] [node name="mikel_collision" type="CollisionPolygon2D" parent="mikel"]
position = Vector2( 751, -159 ) position = Vector2( 751, -159 )
scale = Vector2( 0.963362, 0.9875 ) scale = Vector2( 0.963362, 0.9875 )
polygon = PoolVector2Array( 129.754, 469.873, 129.754, 371.646, 140.134, 369.62, 183.732, 381.772, 184.77, 471.899 ) polygon = PackedVector2Array( 129.754, 469.873, 129.754, 371.646, 140.134, 369.62, 183.732, 381.772, 184.77, 471.899 )
[node name="mikel_location" type="Position2D" parent="mikel"] [node name="mikel_location" type="Marker2D" parent="mikel"]
position = Vector2( 857, 491 ) position = Vector2( 857, 491 )
script = ExtResource( 5 ) script = ExtResource( 5 )

View File

@@ -1,4 +1,4 @@
extends AnimatedSprite extends AnimatedSprite2D
# Declare member variables here. Examples: # Declare member variables here. Examples:

View File

@@ -1,12 +1,12 @@
[gd_scene load_steps=26 format=2] [gd_scene load_steps=26 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-donkey-sheet.png" type="Texture" id=2] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-donkey-sheet.png" type="Texture2D" id=2]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-disco-sheet.png" type="Texture" id=3] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-disco-sheet.png" type="Texture2D" id=3]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-pulp-sheet.png" type="Texture" id=4] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-pulp-sheet.png" type="Texture2D" id=4]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-idle.png" type="Texture" id=5] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-idle.png" type="Texture2D" id=5]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd" type="Script" id=7] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd" type="Script" id=7]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-speak-sheet.png" type="Texture" id=8] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-speak-sheet.png" type="Texture2D" id=8]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres" type="Resource" id=9] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres" type="Resource" id=9]
[sub_resource type="CapsuleShape2D" id=1] [sub_resource type="CapsuleShape2D" id=1]
@@ -117,7 +117,7 @@ animations = [ {
} ] } ]
[node name="EnekoDancing" type="Area2D"] [node name="EnekoDancing" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "eneko_dancing" global_id = "eneko_dancing"
is_interactive = false is_interactive = false
@@ -129,15 +129,15 @@ animations = ExtResource( 9 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."] [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
frames = SubResource( 14 ) frames = SubResource( 14 )
animation = "idle" animation = "idle"
script = ExtResource( 7 ) script = ExtResource( 7 )
[node name="Timer" type="Timer" parent="AnimatedSprite"] [node name="Timer" type="Timer" parent="AnimatedSprite2D"]
wait_time = 6.0 wait_time = 6.0
[node name="dialog_position" type="Position2D" parent="."] [node name="dialog_position" type="Marker2D" parent="."]
position = Vector2( -2, -273 ) position = Vector2( -2, -273 )
[connection signal="timeout" from="AnimatedSprite/Timer" to="AnimatedSprite" method="_on_Timer_timeout"] [connection signal="timeout" from="AnimatedSprite2D/Timer" to="AnimatedSprite2D" method="_on_Timer_timeout"]

View File

@@ -1,12 +1,12 @@
[gd_scene load_steps=26 format=2] [gd_scene load_steps=26 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-donkey-sheet.png" type="Texture" id=2] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-donkey-sheet.png" type="Texture2D" id=2]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-idle.png" type="Texture" id=3] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-idle.png" type="Texture2D" id=3]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-pulp-sheet.png" type="Texture" id=4] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-pulp-sheet.png" type="Texture2D" id=4]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-disco-sheet.png" type="Texture" id=5] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-disco-sheet.png" type="Texture2D" id=5]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd" type="Script" id=6] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd" type="Script" id=6]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-speak-sheet.png" type="Texture" id=7] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-speak-sheet.png" type="Texture2D" id=7]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres" type="Resource" id=8] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres" type="Resource" id=8]
[sub_resource type="CapsuleShape2D" id=1] [sub_resource type="CapsuleShape2D" id=1]
@@ -117,7 +117,7 @@ animations = [ {
} ] } ]
[node name="OierDancing" type="Area2D"] [node name="OierDancing" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "oier_dancing" global_id = "oier_dancing"
is_interactive = false is_interactive = false
@@ -129,15 +129,15 @@ animations = ExtResource( 8 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="AnimatedSprite" type="AnimatedSprite" parent="."] [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
frames = SubResource( 14 ) frames = SubResource( 14 )
animation = "idle" animation = "idle"
script = ExtResource( 6 ) script = ExtResource( 6 )
[node name="Timer" type="Timer" parent="AnimatedSprite"] [node name="Timer" type="Timer" parent="AnimatedSprite2D"]
wait_time = 6.0 wait_time = 6.0
[node name="dialog_position" type="Position2D" parent="."] [node name="dialog_position" type="Marker2D" parent="."]
position = Vector2( -2, -273 ) position = Vector2( -2, -273 )
[connection signal="timeout" from="AnimatedSprite/Timer" to="AnimatedSprite" method="_on_Timer_timeout"] [connection signal="timeout" from="AnimatedSprite2D/Timer" to="AnimatedSprite2D" method="_on_Timer_timeout"]

View File

@@ -2,10 +2,10 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2] [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/background.png" type="Texture" id=3] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/background.png" type="Texture2D" id=3]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/scrollingText.tscn" type="PackedScene" id=4] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/scrollingText.tscn" type="PackedScene" id=4]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn" type="PackedScene" id=5] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn" type="PackedScene" id=5]
[ext_resource path="res://gymkhana/logo-small.png" type="Texture" id=6] [ext_resource path="res://gymkhana/logo-small.png" type="Texture2D" id=6]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/SceneHandler.gd" type="Script" id=7] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/SceneHandler.gd" type="Script" id=7]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/RestartGameButton.gd" type="Script" id=8] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/RestartGameButton.gd" type="Script" id=8]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn" type="PackedScene" id=9] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn" type="PackedScene" id=9]
@@ -18,26 +18,26 @@ player_scene = ExtResource( 2 )
camera_limits = [ Rect2( 0, 0, 1280, 577 ) ] camera_limits = [ Rect2( 0, 0, 1280, 577 ) ]
editor_debug_mode = 1 editor_debug_mode = 1
[node name="background" type="Sprite" parent="."] [node name="background" type="Sprite2D" parent="."]
position = Vector2( 644.5, 372.812 ) position = Vector2( 644.5, 372.812 )
scale = Vector2( 1.01797, 1.29008 ) scale = Vector2( 1.01797, 1.29008 )
texture = ExtResource( 3 ) texture = ExtResource( 3 )
[node name="scrollingText" parent="." instance=ExtResource( 4 )] [node name="scrollingText" parent="." instance=ExtResource( 4 )]
margin_left = 368.0 offset_left = 368.0
margin_top = 764.0 offset_top = 764.0
margin_right = 933.0 offset_right = 933.0
margin_bottom = 1201.0 offset_bottom = 1201.0
[node name="Button" type="Button" parent="."] [node name="Button" type="Button" parent="."]
margin_left = 495.0 offset_left = 495.0
margin_top = 486.0 offset_top = 486.0
margin_right = 845.0 offset_right = 845.0
margin_bottom = 612.0 offset_bottom = 612.0
text = "Volver al menú" text = "Volver al menú"
script = ExtResource( 8 ) script = ExtResource( 8 )
[node name="Logo-small" type="Sprite" parent="Button"] [node name="Logo-small" type="Sprite2D" parent="Button"]
position = Vector2( 176.25, -190.5 ) position = Vector2( 176.25, -190.5 )
scale = Vector2( 1.01504, 1.00333 ) scale = Vector2( 1.01504, 1.00333 )
texture = ExtResource( 6 ) texture = ExtResource( 6 )

View File

@@ -1,42 +1,42 @@
[gd_scene load_steps=4 format=2] [gd_scene load_steps=4 format=2]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/uliwood-productions.png" type="Texture" id=1] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/uliwood-productions.png" type="Texture2D" id=1]
[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/scrollingText.gd" type="Script" id=2] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/scrollingText.gd" type="Script" id=2]
[sub_resource type="Theme" id=1] [sub_resource type="Theme" id=1]
[node name="scrollingText" type="VBoxContainer"] [node name="scrollingText" type="VBoxContainer"]
margin_left = 357.0 offset_left = 357.0
margin_right = 922.0 offset_right = 922.0
margin_bottom = 744.0 offset_bottom = 744.0
grow_horizontal = 0 grow_horizontal = 0
script = ExtResource( 2 ) script = ExtResource( 2 )
[node name="RichTextLabel" type="RichTextLabel" parent="."] [node name="RichTextLabel" type="RichTextLabel" parent="."]
margin_right = 600.0 offset_right = 600.0
margin_bottom = 30.0 offset_bottom = 30.0
theme = SubResource( 1 ) theme = SubResource( 1 )
bbcode_enabled = true bbcode_enabled = true
bbcode_text = "[center][u]Las Gymkhanicas de Uli[/u][/center] text = "[center][u]Las Gymkhanicas de Uli[/u][/center]
" "
text = "Las Gymkhanicas de Uli text = "Las Gymkhanicas de Uli
" "
fit_content_height = true fit_content_height = true
[node name="LabelContainer" type="HBoxContainer" parent="."] [node name="LabelContainer" type="HBoxContainer" parent="."]
margin_top = 34.0 offset_top = 34.0
margin_right = 600.0 offset_right = 600.0
margin_bottom = 507.0 offset_bottom = 507.0
[node name="margin" type="MarginContainer" parent="LabelContainer"] [node name="margin" type="MarginContainer" parent="LabelContainer"]
margin_right = 288.0 offset_right = 288.0
margin_bottom = 405.0 offset_bottom = 405.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 0 size_flags_vertical = 0
[node name="Titles" type="Label" parent="LabelContainer/margin"] [node name="Titles" type="Label" parent="LabelContainer/margin"]
margin_right = 288.0 offset_right = 288.0
margin_bottom = 405.0 offset_bottom = 405.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 0 size_flags_vertical = 0
text = "Creado por text = "Creado por
@@ -67,22 +67,22 @@ align = 2
uppercase = true uppercase = true
[node name="spacer" type="Label" parent="LabelContainer"] [node name="spacer" type="Label" parent="LabelContainer"]
margin_left = 292.0 offset_left = 292.0
margin_top = 229.0 offset_top = 229.0
margin_right = 308.0 offset_right = 308.0
margin_bottom = 243.0 offset_bottom = 243.0
text = " " text = " "
[node name="margin2" type="MarginContainer" parent="LabelContainer"] [node name="margin2" type="MarginContainer" parent="LabelContainer"]
margin_left = 312.0 offset_left = 312.0
margin_right = 600.0 offset_right = 600.0
margin_bottom = 473.0 offset_bottom = 473.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 0 size_flags_vertical = 0
[node name="Names" type="Label" parent="LabelContainer/margin2"] [node name="Names" type="Label" parent="LabelContainer/margin2"]
margin_right = 288.0 offset_right = 288.0
margin_bottom = 473.0 offset_bottom = 473.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 0 size_flags_vertical = 0
text = "Eneko text = "Eneko
@@ -115,7 +115,7 @@ A la comunidad detrás de Godot y Escoria
por hacer posible este juego" por hacer posible este juego"
[node name="TextureRect" type="TextureRect" parent="."] [node name="TextureRect" type="TextureRect" parent="."]
margin_top = 511.0 offset_top = 511.0
margin_right = 600.0 offset_right = 600.0
margin_bottom = 806.0 offset_bottom = 806.0
texture = ExtResource( 1 ) texture = ExtResource( 1 )

View File

@@ -2,17 +2,17 @@
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2] [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2]
[ext_resource path="res://gymkhana/rooms/turno_cocina/despensa/assets/background.png" type="Texture" id=3] [ext_resource path="res://gymkhana/rooms/turno_cocina/despensa/assets/background.png" type="Texture2D" id=3]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6]
[ext_resource path="res://gymkhana/items/inventory/turno_cocina_patata_grande.tscn" type="PackedScene" id=7] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_patata_grande.tscn" type="PackedScene" id=7]
[ext_resource path="res://gymkhana/rooms/turno_cocina/despensa/assets/columna.png" type="Texture" id=8] [ext_resource path="res://gymkhana/rooms/turno_cocina/despensa/assets/columna.png" type="Texture2D" id=8]
[sub_resource type="NavigationPolygon" id=60] [sub_resource type="NavigationPolygon" id=60]
vertices = PoolVector2Array( 1137, 615, 1143, 660, 501, 666, 503, 650, 837, 624, 597, 610, 503, 628 ) vertices = PackedVector2Array( 1137, 615, 1143, 660, 501, 666, 503, 650, 837, 624, 597, 610, 503, 628 )
polygons = [ PoolIntArray( 0, 1, 2, 3, 4 ), PoolIntArray( 5, 4, 3, 6 ) ] polygons = [ PackedInt32Array( 0, 1, 2, 3, 4 ), PackedInt32Array( 5, 4, 3, 6 ) ]
outlines = [ PoolVector2Array( 503, 650, 503, 628, 597, 610, 837, 624, 1137, 615, 1143, 660, 501, 666 ) ] outlines = [ PackedVector2Array( 503, 650, 503, 628, 597, 610, 837, 624, 1137, 615, 1143, 660, 501, 666 ) ]
[node name="ESCRoom2" type="Node2D"] [node name="ESCRoom2" type="Node2D"]
script = ExtResource( 1 ) script = ExtResource( 1 )
@@ -22,7 +22,7 @@ player_scene = ExtResource( 2 )
camera_limits = [ Rect2( 0, 0, 1280, 577 ) ] camera_limits = [ Rect2( 0, 0, 1280, 577 ) ]
editor_debug_mode = 1 editor_debug_mode = 1
[node name="background" type="Sprite" parent="."] [node name="background" type="Sprite2D" parent="."]
position = Vector2( 636, 289.125 ) position = Vector2( 636, 289.125 )
texture = ExtResource( 3 ) texture = ExtResource( 3 )
@@ -33,12 +33,12 @@ scale_min = 1.0
scale_max = 1.5 scale_max = 1.5
player_speed_multiplier = 0.5 player_speed_multiplier = 0.5
[node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="ESCTerrain"] [node name="NavigationRegion2D" type="NavigationRegion2D" parent="ESCTerrain"]
position = Vector2( -272, 117 ) position = Vector2( -272, 117 )
navpoly = SubResource( 60 ) navigation_polygon = SubResource( 60 )
[node name="puerta_exterior" type="Area2D" parent="."] [node name="puerta_exterior" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
position = Vector2( 863, 175 ) position = Vector2( 863, 175 )
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "turno_cocina_despensa_puerta_exterior" global_id = "turno_cocina_despensa_puerta_exterior"
@@ -55,13 +55,13 @@ animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="puerta_exterior"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="puerta_exterior"]
position = Vector2( 161.721, -721 ) position = Vector2( 161.721, -721 )
scale = Vector2( 1.54174, 1.99167 ) scale = Vector2( 1.54174, 1.99167 )
polygon = PoolVector2Array( 0.181213, 566.359, 5.19019, 273.946, 167.524, 274.142, 164.281, 563.848 ) polygon = PackedVector2Array( 0.181213, 566.359, 5.19019, 273.946, 167.524, 274.142, 164.281, 563.848 )
[node name="ESCLocation" type="Position2D" parent="puerta_exterior"] [node name="ESCLocation" type="Marker2D" parent="puerta_exterior"]
position = Vector2( 151, 575 ) position = Vector2( 151, 575 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="start" type="Position2D" parent="."] [node name="start" type="Marker2D" parent="."]
position = Vector2( 899, 758 ) position = Vector2( 899, 758 )
script = ExtResource( 5 ) script = ExtResource( 5 )
global_id = "start" global_id = "start"
@@ -69,7 +69,7 @@ is_start_location = true
player_orients_on_arrival = false player_orients_on_arrival = false
[node name="cebolla izq" type="Area2D" parent="."] [node name="cebolla izq" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
position = Vector2( 452, 192 ) position = Vector2( 452, 192 )
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "turno_cocina_despensa_cebolla_izq" global_id = "turno_cocina_despensa_cebolla_izq"
@@ -86,14 +86,14 @@ animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cebolla izq"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cebolla izq"]
position = Vector2( 60.6594, -46.582 ) position = Vector2( 60.6594, -46.582 )
scale = Vector2( 0.865036, 0.883608 ) scale = Vector2( 0.865036, 0.883608 )
polygon = PoolVector2Array( -37.755, 99.1186, -24, 109, 82, 109, 85, 19, 81.3152, -29.8979, 77.8471, -43.4786, -26.1948, -36.6882, -35, -27, -38.911, 31.2152 ) polygon = PackedVector2Array( -37.755, 99.1186, -24, 109, 82, 109, 85, 19, 81.3152, -29.8979, 77.8471, -43.4786, -26.1948, -36.6882, -35, -27, -38.911, 31.2152 )
[node name="ESCLocation" type="Position2D" parent="cebolla izq"] [node name="ESCLocation" type="Marker2D" parent="cebolla izq"]
position = Vector2( 56, 553 ) position = Vector2( 56, 553 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="cebolla der" type="Area2D" parent="."] [node name="cebolla der" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
position = Vector2( 941, 385 ) position = Vector2( 941, 385 )
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "turno_cocina_despensa_cebolla_der" global_id = "turno_cocina_despensa_cebolla_der"
@@ -110,14 +110,14 @@ animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cebolla der"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="cebolla der"]
position = Vector2( -305.617, -238.789 ) position = Vector2( -305.617, -238.789 )
scale = Vector2( 0.829392, 0.888258 ) scale = Vector2( 0.829392, 0.888258 )
polygon = PoolVector2Array( -45, 103, -24, 109, 82, 109, 95, 16, 72, -39, 63, -54, -31, -56, -46, -53, -51, -31, -52.307, 11.0204 ) polygon = PackedVector2Array( -45, 103, -24, 109, 82, 109, 95, 16, 72, -39, 63, -54, -31, -56, -46, -53, -51, -31, -52.307, 11.0204 )
[node name="ESCLocation" type="Position2D" parent="cebolla der"] [node name="ESCLocation" type="Marker2D" parent="cebolla der"]
position = Vector2( -337, 368 ) position = Vector2( -337, 368 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="bidon_der" type="Area2D" parent="."] [node name="bidon_der" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
position = Vector2( 941, 385 ) position = Vector2( 941, 385 )
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "turno_cocina_despensa_bidon_der" global_id = "turno_cocina_despensa_bidon_der"
@@ -134,14 +134,14 @@ animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_der"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_der"]
position = Vector2( -129, 84 ) position = Vector2( -129, 84 )
scale = Vector2( 0.9425, 0.837376 ) scale = Vector2( 0.9425, 0.837376 )
polygon = PoolVector2Array( -42.4403, 130.169, -24.4032, 131.363, 57.2944, 130.169, 62.5995, 109.867, 64.7215, 78.8176, 67.9045, 17.9131, 62.5995, -9.55365, 67.9045, -20.3015, 63.6605, -37.0204, 56.2335, -51.3509, 20.1592, -59.7103, -6.36603, -59.7103, -29.7082, -53.7393, -36.0742, -44.1857, -38.1963, -26.2725, -31.8302, -10.7479, -35, 9, -39.2573, 37.0204 ) polygon = PackedVector2Array( -42.4403, 130.169, -24.4032, 131.363, 57.2944, 130.169, 62.5995, 109.867, 64.7215, 78.8176, 67.9045, 17.9131, 62.5995, -9.55365, 67.9045, -20.3015, 63.6605, -37.0204, 56.2335, -51.3509, 20.1592, -59.7103, -6.36603, -59.7103, -29.7082, -53.7393, -36.0742, -44.1857, -38.1963, -26.2725, -31.8302, -10.7479, -35, 9, -39.2573, 37.0204 )
[node name="ESCLocation" type="Position2D" parent="bidon_der"] [node name="ESCLocation" type="Marker2D" parent="bidon_der"]
position = Vector2( -97, 370 ) position = Vector2( -97, 370 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="bidon_izq" type="Area2D" parent="."] [node name="bidon_izq" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
position = Vector2( 941, 385 ) position = Vector2( 941, 385 )
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "turno_cocina_despensa_bidon_izq" global_id = "turno_cocina_despensa_bidon_izq"
@@ -158,9 +158,9 @@ animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_izq"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_izq"]
position = Vector2( -300, 61 ) position = Vector2( -300, 61 )
scale = Vector2( 0.836355, 1.05961 ) scale = Vector2( 0.836355, 1.05961 )
polygon = PoolVector2Array( -38.2613, -9.43741, -11.9567, -14.1561, 17.935, -16.0436, 40.6526, -12.2686, 45.4352, -14.1561, 49.0222, -17.9311, 46.6309, -23.5936, 45.4352, -29.256, 41.8483, -33.9748, 35.8699, -36.806, 10.761, -40.581, -19.1306, -40.581, -37, -37, -51, -31, -52.6093, -25.481, -51.4136, -20.7623, -51.4136, -14.1561, -44.2396, -10.3812 ) polygon = PackedVector2Array( -38.2613, -9.43741, -11.9567, -14.1561, 17.935, -16.0436, 40.6526, -12.2686, 45.4352, -14.1561, 49.0222, -17.9311, 46.6309, -23.5936, 45.4352, -29.256, 41.8483, -33.9748, 35.8699, -36.806, 10.761, -40.581, -19.1306, -40.581, -37, -37, -51, -31, -52.6093, -25.481, -51.4136, -20.7623, -51.4136, -14.1561, -44.2396, -10.3812 )
[node name="ESCLocation" type="Position2D" parent="bidon_izq"] [node name="ESCLocation" type="Marker2D" parent="bidon_izq"]
position = Vector2( -270, 372 ) position = Vector2( -270, 372 )
script = ExtResource( 5 ) script = ExtResource( 5 )
@@ -176,21 +176,21 @@ custom_data = {
} }
} }
[node name="ESCLocation2" type="Position2D" parent="turno_cocina_patata_grande"] [node name="ESCLocation2" type="Marker2D" parent="turno_cocina_patata_grande"]
position = Vector2( 40.8889, 672.79 ) position = Vector2( 40.8889, 672.79 )
script = ExtResource( 5 ) script = ExtResource( 5 )
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_patata_grande"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="turno_cocina_patata_grande"]
polygon = PoolVector2Array( 21.5802, 76.6327, 32.9383, 42.8241, 37.4815, 21.4121, 37.4815, -25.9199, 36.3457, -61.9823, -39.7531, -63.1093, -42.0247, 80.0135 ) polygon = PackedVector2Array( 21.5802, 76.6327, 32.9383, 42.8241, 37.4815, 21.4121, 37.4815, -25.9199, 36.3457, -61.9823, -39.7531, -63.1093, -42.0247, 80.0135 )
[node name="foreground" type="Sprite" parent="."] [node name="foreground" type="Sprite2D" parent="."]
position = Vector2( 304, 351 ) position = Vector2( 304, 351 )
scale = Vector2( 0.994367, 0.994367 ) scale = Vector2( 0.994367, 0.994367 )
z_index = 4096 z_index = 4096
texture = ExtResource( 8 ) texture = ExtResource( 8 )
[node name="bidon_cntr" type="Area2D" parent="."] [node name="bidon_cntr" type="Area2D" parent="."]
pause_mode = 1 process_mode = 1
position = Vector2( 941, 385 ) position = Vector2( 941, 385 )
script = ExtResource( 6 ) script = ExtResource( 6 )
global_id = "turno_cocina_despensa_bidon_cntr" global_id = "turno_cocina_despensa_bidon_cntr"
@@ -212,8 +212,8 @@ animations = null
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_cntr"] [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="bidon_cntr"]
position = Vector2( -245, 95 ) position = Vector2( -245, 95 )
scale = Vector2( 0.9425, 0.837376 ) scale = Vector2( 0.9425, 0.837376 )
polygon = PoolVector2Array( -39.2573, 118.226, -23.3422, 117.032, 63.6605, 118.226, 63.6605, 11.942, 57.2944, -7.16528, 59.4164, -13.1363, 60.4775, -23.8842, 59.4164, -32.2436, 54.1114, -42.9915, 45.6234, -50.1567, 30.7692, -56.1277, 13.7931, -58.5162, -4.24402, -58.5162, -21.2202, -53.7393, -33.9523, -47.7683, -44, -26, -43.5013, -17.9131, -40.3183, -10.7479, -42.4404, 9.55365, -41.3793, 50.1567 ) polygon = PackedVector2Array( -39.2573, 118.226, -23.3422, 117.032, 63.6605, 118.226, 63.6605, 11.942, 57.2944, -7.16528, 59.4164, -13.1363, 60.4775, -23.8842, 59.4164, -32.2436, 54.1114, -42.9915, 45.6234, -50.1567, 30.7692, -56.1277, 13.7931, -58.5162, -4.24402, -58.5162, -21.2202, -53.7393, -33.9523, -47.7683, -44, -26, -43.5013, -17.9131, -40.3183, -10.7479, -42.4404, 9.55365, -41.3793, 50.1567 )
[node name="ESCLocation" type="Position2D" parent="bidon_cntr"] [node name="ESCLocation" type="Marker2D" parent="bidon_cntr"]
position = Vector2( -189, 372 ) position = Vector2( -189, 372 )
script = ExtResource( 5 ) script = ExtResource( 5 )

File diff suppressed because it is too large Load Diff

View File

@@ -221,7 +221,7 @@ events = {
} }
terrain_navpolys = { terrain_navpolys = {
"cocina_delante": { "cocina_delante": {
"NavigationPolygonInstance": true "NavigationRegion2D": true
} }
} }
settings = { settings = {

View File

@@ -266,7 +266,7 @@ events = {
} }
terrain_navpolys = { terrain_navpolys = {
"cocina_delante": { "cocina_delante": {
"NavigationPolygonInstance": true "NavigationRegion2D": true
} }
} }
settings = { settings = {

View File

@@ -433,7 +433,7 @@ events = {
} }
terrain_navpolys = { terrain_navpolys = {
"cocina": { "cocina": {
"NavigationPolygonInstance": true "NavigationRegion2D": true
} }
} }
settings = { settings = {

View File

@@ -240,7 +240,7 @@ events = {
} }
terrain_navpolys = { terrain_navpolys = {
"cocina_delante": { "cocina_delante": {
"NavigationPolygonInstance": true "NavigationRegion2D": true
} }
} }
settings = { settings = {

View File

@@ -1,14 +1,14 @@
[gd_scene load_steps=5 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1]
[ext_resource path="res://gymkhana/items/inventory/assets/BASENAME.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/BASENAME.png" type="Texture2D" id=2]
[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 22.5, 12.5 ) extents = Vector2( 22.5, 12.5 )
[node name="BASENAME" type="Area2D"] [node name="BASENAME" type="Area2D"]
pause_mode = 1 process_mode = 1
script = ExtResource( 1 ) script = ExtResource( 1 )
global_id = "BASENAME" global_id = "BASENAME"
esc_script = "res://gymkhana/items/inventory/BASENAME.esc" esc_script = "res://gymkhana/items/inventory/BASENAME.esc"
@@ -20,7 +20,7 @@ action3_text = "Mirar"
action4_text = "Usar" action4_text = "Usar"
animations = null animations = null
[node name="Sprite" type="Sprite" parent="."] [node name="Sprite2D" type="Sprite2D" parent="."]
position = Vector2( -2, 0 ) position = Vector2( -2, 0 )
scale = Vector2( 0.5, 0.5 ) scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
@@ -29,6 +29,6 @@ texture = ExtResource( 2 )
position = Vector2( -1.5, -0.5 ) position = Vector2( -1.5, -0.5 )
shape = SubResource( 1 ) shape = SubResource( 1 )
[node name="ESCLocation" type="Position2D" parent="."] [node name="ESCLocation" type="Marker2D" parent="."]
position = Vector2( -51, 69 ) position = Vector2( -51, 69 )
script = ExtResource( 3 ) script = ExtResource( 3 )