diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn b/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn index 0c67c926..3856c7d3 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/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/chooser/simple.gd" type="Script" id=1] +[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" type="Theme" id=2] [sub_resource type="Gradient" id=1] colors = PoolColorArray( 1, 0, 0, 1, 1, 0, 0, 1 ) diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd index ff5e656b..16920c76 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/plugin.gd @@ -4,7 +4,7 @@ extends EditorPlugin class_name RTMISimpleDialogPlugin -const MANAGER_CLASS="res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd" +const MANAGER_CLASS="res://addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd" const SETTINGS_ROOT="escoria/rtmi_dialog_simple" const READING_SPEED_IN_WPM_DEFAULT_VALUE = 200 diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd index cb98a731..c9e55919 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd @@ -4,7 +4,7 @@ class_name ESCReturnToMonekyIslandDialogs # State machine that governs how the dialog manager behaves -var state_machine = preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd").new() +var state_machine = preload("res://addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd").new() # The currently running player var _type_player: Node = null @@ -113,11 +113,11 @@ func do_say(global_id: String, text: String) -> void: func _init_type_player(type: String) -> void: if type == "floating": _type_player = preload(\ - "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn"\ + "res://addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn"\ ).instance() else: _type_player = preload(\ - "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn"\ + "res://addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn"\ ).instance() _type_player.connect("say_finished", self, "_on_say_finished") @@ -164,7 +164,7 @@ func do_choose(dialog_player: Node, dialog: ESCDialog, type: String = "simple"): if type == "simple" or type == "": chooser = preload(\ - "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn"\ + "res://addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn"\ ).instance() dialog_player.add_child(chooser) diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd index d2ca1bdc..9bf0a044 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple_state_machine.gd @@ -1,4 +1,4 @@ -extends "res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state_machine.gd" +extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state_machine.gd" func _init(): @@ -14,14 +14,14 @@ func _init(): # Creates the states for this state machine. func _create_states() -> void: states_map = { - "idle": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd").new(), - "say": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd").new(), - "say_fast": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd").new(), - "say_finish": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd").new(), - "visible": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd").new(), - "finish": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd").new(), - "interrupt": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd").new(), - "choices": preload("res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd").new(), + "idle": preload("res://addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd").new(), + "say": preload("res://addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd").new(), + "say_fast": preload("res://addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd").new(), + "say_finish": preload("res://addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd").new(), + "visible": preload("res://addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd").new(), + "finish": preload("res://addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd").new(), + "interrupt": preload("res://addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd").new(), + "choices": preload("res://addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd").new(), } diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd index 635d6831..067e6bbf 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_choices.gd @@ -1,4 +1,4 @@ -extends "res://addons/escoria-dialog-simple/patterns/state_machine/state.gd" +extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd" # The owning dialog player. diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd index 3bdccd76..e7f0036a 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_finish.gd @@ -1,4 +1,4 @@ -extends "res://addons/escoria-dialog-simple/patterns/state_machine/state.gd" +extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd" # Owning dialog player diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd index b36d254d..3d248edb 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_idle.gd @@ -1,4 +1,4 @@ -extends "res://addons/escoria-dialog-simple/patterns/state_machine/state.gd" +extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd" func enter(): diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd index e9bd54c0..2a41ac6d 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_interrupt.gd @@ -1,4 +1,4 @@ -extends "res://addons/escoria-dialog-simple/patterns/state_machine/state.gd" +extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd" # Reference to the currently playing dialog manager diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd index 5f14cc24..16d59f31 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say.gd @@ -1,4 +1,4 @@ -extends "res://addons/escoria-dialog-simple/patterns/state_machine/state.gd" +extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd" # A regular expression that separates the translation key from the text diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd index f0cfaa44..d61a0a9e 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_fast.gd @@ -1,4 +1,4 @@ -extends "res://addons/escoria-dialog-simple/patterns/state_machine/state.gd" +extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd" # Reference to the currently playing dialog manager diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd index ac3efe44..b18ac0b4 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_say_finish.gd @@ -1,4 +1,4 @@ -extends "res://addons/escoria-dialog-simple/patterns/state_machine/state.gd" +extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd" # Reference to the currently playing dialog manager diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd index f340d174..6721a684 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/states/dialog_visible.gd @@ -1,4 +1,4 @@ -extends "res://addons/escoria-dialog-simple/patterns/state_machine/state.gd" +extends "res://addons/escoria-ui-return-monkey-island-dialog-simple/patterns/state_machine/state.gd" # Reference to the currently playing dialog manager diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres b/addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres index 085f625a..0de51096 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres @@ -1,6 +1,6 @@ [gd_resource type="Theme" load_steps=3 format=2] -[ext_resource path="res://gymkhana/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="DynamicFont" id=1] [sub_resource type="StyleBoxFlat" id=1] content_margin_left = 5.0 diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd index ebd87ef5..698b9533 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd @@ -47,7 +47,7 @@ onready var is_paused: bool = true # Build up the UI func _ready(): _text_time_per_character = ProjectSettings.get_setting( - SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS + RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS ) if _text_time_per_character < 0: @@ -55,15 +55,15 @@ func _ready(): self, "%s setting must be a non-negative number. Will use default value of %s." % [ - SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS, - SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE + RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS, + RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE ] ) - _text_time_per_character = SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE + _text_time_per_character = RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE _fast_text_time_per_character = ProjectSettings.get_setting( - SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST + RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST ) if _fast_text_time_per_character < 0: @@ -71,15 +71,15 @@ func _ready(): self, "%s setting must be a non-negative number. Will use default value of %s." % [ - SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST, - SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE + RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST, + RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE ] ) - _fast_text_time_per_character = SimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE + _fast_text_time_per_character = RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE _reading_speed_in_wpm = ProjectSettings.get_setting( - SimpleDialogPlugin.READING_SPEED_IN_WPM + RTMISimpleDialogPlugin.READING_SPEED_IN_WPM ) if _reading_speed_in_wpm <= 0: @@ -87,12 +87,12 @@ func _ready(): self, "%s setting must be a positive number. Will use default value of %s." % [ - SimpleDialogPlugin.READING_SPEED_IN_WPM, - SimpleDialogPlugin.READING_SPEED_IN_WPM_DEFAULT_VALUE + RTMISimpleDialogPlugin.READING_SPEED_IN_WPM, + RTMISimpleDialogPlugin.READING_SPEED_IN_WPM_DEFAULT_VALUE ] ) - _reading_speed_in_wpm = SimpleDialogPlugin.READING_SPEED_IN_WPM_DEFAULT_VALUE + _reading_speed_in_wpm = RTMISimpleDialogPlugin.READING_SPEED_IN_WPM_DEFAULT_VALUE _word_regex.compile("\\S+") @@ -208,7 +208,7 @@ func _get_number_of_words() -> int: # Ending the dialog func _on_dialog_finished(): # Only trigger to clear the text if we aren't limiting the clearing trigger to a click. - if not ESCProjectSettingsManager.get_setting(SimpleDialogPlugin.CLEAR_TEXT_BY_CLICK_ONLY): + if not ESCProjectSettingsManager.get_setting(RTMISimpleDialogPlugin.CLEAR_TEXT_BY_CLICK_ONLY): emit_signal("say_finished") queue_free() diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn b/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn index 282ea329..8a934eea 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://addons/escoria-dialog-simple/types/avatar.gd" type="Script" id=1] +[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/types/avatar.gd" type="Script" id=1] [node name="dialog_box" type="Popup"] anchor_right = 1.0 diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd index 241d701a..587b19fb 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.gd @@ -46,7 +46,7 @@ onready var is_paused: bool = true # Enable bbcode and catch the signal when a tween completed func _ready(): _text_time_per_character = ProjectSettings.get_setting( - RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS ) if _text_time_per_character < 0: @@ -54,15 +54,15 @@ func _ready(): self, "%s setting must be a non-negative number. Will use default value of %s." % [ - RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS, - RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS, + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE ] ) _text_time_per_character = RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_DEFAULT_VALUE _fast_text_time_per_character = ProjectSettings.get_setting( - RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST ) if _fast_text_time_per_character < 0: @@ -70,15 +70,15 @@ func _ready(): self, "%s setting must be a non-negative number. Will use default value of %s." % [ - RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST, - RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST, + RTMISimpleDialogSettings.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE ] ) _fast_text_time_per_character = RTMISimpleDialogPlugin.TEXT_TIME_PER_LETTER_MS_FAST_DEFAULT_VALUE _reading_speed_in_wpm = ProjectSettings.get_setting( - RTMISimpleDialogPlugin.READING_SPEED_IN_WPM + RTMISimpleDialogSettings.READING_SPEED_IN_WPM ) if _reading_speed_in_wpm <= 0: @@ -86,12 +86,12 @@ func _ready(): self, "%s setting must be a positive number. Will use default value of %s." % [ - RTMISimpleDialogPlugin.READING_SPEED_IN_WPM, - RTMISimpleDialogPlugin.READING_SPEED_IN_WPM_DEFAULT_VALUE + RTMISimpleDialogSettings.READING_SPEED_IN_WPM, + RTMISimpleDialogSettings.READING_SPEED_IN_WPM_DEFAULT_VALUE ] ) - _reading_speed_in_wpm = RTMISimpleDialogPlugin.READING_SPEED_IN_WPM_DEFAULT_VALUE + _reading_speed_in_wpm = RTMISimpleDialogSettings.READING_SPEED_IN_WPM_DEFAULT_VALUE _word_regex.compile("\\S+") @@ -227,7 +227,7 @@ func _get_number_of_words() -> int: # Ending the dialog func _on_dialog_finished(): # Only trigger to clear the text if we aren't limiting the clearing trigger to a click. - if not ESCProjectSettingsManager.get_setting(RTMISimpleDialogPlugin.CLEAR_TEXT_BY_CLICK_ONLY): + if not ESCProjectSettingsManager.get_setting(RTMISimpleDialogSettings.CLEAR_TEXT_BY_CLICK_ONLY): emit_signal("say_finished") diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn b/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn index e670b198..6fa467c9 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/types/floating.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://addons/escoria-dialog-simple/types/floating.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/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/types/floating.gd" type="Script" id=1] +[ext_resource path="res://addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" type="Theme" id=2] [node name="dialog_label" type="RichTextLabel"] margin_right = 672.0 diff --git a/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd b/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd index b5a78ee7..8bc37c08 100644 --- a/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd +++ b/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd @@ -31,8 +31,6 @@ export(int) var count = 0 # ESCItemComponents children of this node var components: Dictionary = {} -var custom_data: Dictionary = {} - # If item is countable (E.g. money) marks which texture to use depending of count value. # Each element is a Dictionary with start and texture keys: # [ diff --git a/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn b/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn index e9b71e55..eecdbbef 100644 --- a/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn +++ b/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.gd" type="Script" id=1] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_right.png" type="Texture" id=2] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/cursors/rounded_mouse_left.png" type="Texture" id=3] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/theme.tres" type="Theme" id=4] +[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_left.png" type="Texture" id=3] +[ext_resource path="res://addons/escoria-ui-return-monkey-island/theme.tres" type="Theme" id=4] [node name="tooltipManager" type="Node2D"] script = ExtResource( 1 ) diff --git a/addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres b/addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres index b5031daa..2c3e4d36 100644 --- a/addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres +++ b/addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres @@ -1,6 +1,6 @@ [gd_resource type="DynamicFont" load_steps=2 format=2] -[ext_resource path="res://gymkhana/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="DynamicFontData" id=1] [resource] size = 21 diff --git a/addons/escoria-ui-return-monkey-island/game.tscn b/addons/escoria-ui-return-monkey-island/game.tscn index 72fcc128..5e9542e9 100644 --- a/addons/escoria-ui-return-monkey-island/game.tscn +++ b/addons/escoria-ui-return-monkey-island/game.tscn @@ -1,21 +1,21 @@ [gd_scene load_steps=17 format=2] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn" type="PackedScene" id=1] +[ext_resource path="res://addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn" type="PackedScene" id=1] [ext_resource path="res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd" type="Script" id=2] [ext_resource path="res://addons/escoria-core/game/scenes/camera_player/camera.tscn" type="PackedScene" id=3] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_rich_tooltip.tscn" type="PackedScene" id=4] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/game.gd" type="Script" id=5] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note.svg" type="Texture" id=6] -[ext_resource path="res://gymkhana/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/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/icons/music-double-note.svg" type="Texture" 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-core/ui_library/menus/pause_menu/pause_menu.tscn" type="PackedScene" id=8] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/theme.tres" type="Theme" id=9] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64-hover.svg" type="Texture" id=10] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/icons/cog-64.svg" type="Texture" id=11] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn" type="PackedScene" id=12] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover.svg" type="Texture" id=13] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/MusicButton.gd" type="Script" id=14] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/icons/music-double-note-hover-disabled.svg" type="Texture" id=15] -[ext_resource path="res://gymkhana/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/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.svg" type="Texture" 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/icons/music-double-note-hover.svg" type="Texture" 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/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-disabled.svg" type="Texture" id=16] [node name="game" type="Node2D"] script = ExtResource( 5 ) diff --git a/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn b/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn index 1336fa3a..f06dd060 100644 --- a/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn +++ b/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd" type="Script" id=1] +[ext_resource path="res://addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-core/ui_library/inventory/esc_inventory_container.gd" type="Script" id=3] [node name="inventory_ui" type="Control"] diff --git a/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn b/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn index a9470285..1e73d296 100644 --- a/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn +++ b/addons/escoria-ui-return-monkey-island/menus/main_menu/main_menu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/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://gymkhana/logo-small.png" type="Texture" id=3] [ext_resource path="res://addons/escoria-core/ui_library/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] diff --git a/addons/escoria-ui-return-monkey-island/plugin.gd b/addons/escoria-ui-return-monkey-island/plugin.gd index 1f9c0e04..90bc242e 100644 --- a/addons/escoria-ui-return-monkey-island/plugin.gd +++ b/addons/escoria-ui-return-monkey-island/plugin.gd @@ -11,7 +11,7 @@ func get_plugin_name(): # Deregister UI func disable_plugin(): print("Disabling plugin Escoria UI Return to Monkey Island.") - EscoriaPlugin.deregister_ui("res://gymkhana/addons/escoria-ui-return-monkey-island/game.tscn") + EscoriaPlugin.deregister_ui("res://addons/escoria-ui-return-monkey-island/game.tscn") ESCProjectSettingsManager.remove_setting( RTMIUiSettings.SOUND_LIBRARY_FOLDER ) @@ -22,7 +22,7 @@ func disable_plugin(): func enable_plugin(): print("Enabling plugin Escoria Dialog Simple") - if EscoriaPlugin.register_ui(self, "res://gymkhana/addons/escoria-ui-return-monkey-island/game.tscn"): + if EscoriaPlugin.register_ui(self, "res://addons/escoria-ui-return-monkey-island/game.tscn"): ESCProjectSettingsManager.register_setting( RTMIUiSettings.SOUND_LIBRARY_FOLDER, "res://game/sounds", diff --git a/addons/escoria-ui-return-monkey-island/theme.tres b/addons/escoria-ui-return-monkey-island/theme.tres index 204985b9..96114dba 100644 --- a/addons/escoria-ui-return-monkey-island/theme.tres +++ b/addons/escoria-ui-return-monkey-island/theme.tres @@ -1,6 +1,6 @@ [gd_resource type="Theme" load_steps=5 format=2] -[ext_resource path="res://gymkhana/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="DynamicFont" id=1] [sub_resource type="StyleBoxFlat" id=1] content_margin_left = 4.0 diff --git a/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn b/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn index 17daefd9..c1af65cf 100644 --- a/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn +++ b/addons/escoria-ui-return-monkey-island/video_player/video_player.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/video_player/video_player.gd" type="Script" id=1] +[ext_resource path="res://addons/escoria-ui-return-monkey-island/video_player/video_player.gd" type="Script" id=1] [sub_resource type="VideoStreamTheora" id=1] diff --git a/gymkhana/characters/eneko/eneko_smoking.tscn b/gymkhana/characters/eneko/eneko_smoking.tscn index 177eb54a..79632f86 100644 --- a/gymkhana/characters/eneko/eneko_smoking.tscn +++ b/gymkhana/characters/eneko/eneko_smoking.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=21 format=2] [ext_resource path="res://gymkhana/characters/eneko/eneko_smoking_animatios.tres" type="Resource" id=1] -[ext_resource path="res://gymkhana/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-002.png" type="Texture" id=5] [ext_resource path="res://gymkhana/characters/eneko/smoking_animation/unscreen-003.png" type="Texture" id=6] diff --git a/gymkhana/characters/oier/oier.tscn b/gymkhana/characters/oier/oier.tscn index 768cdd26..f18557cb 100644 --- a/gymkhana/characters/oier/oier.tscn +++ b/gymkhana/characters/oier/oier.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=32 format=2] -[ext_resource path="res://gymkhana/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_animations.tres" type="Resource" id=3] [ext_resource path="res://gymkhana/characters/oier/oier-mod-talk.png" type="Texture" id=4] diff --git a/gymkhana/items/inventory/turno_cocina_ajo.tscn b/gymkhana/items/inventory/turno_cocina_ajo.tscn index 801f9062..d1b9bc0e 100644 --- a/gymkhana/items/inventory/turno_cocina_ajo.tscn +++ b/gymkhana/items/inventory/turno_cocina_ajo.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://gymkhana/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] [node name="turno_cocina_ajo" type="Area2D"] diff --git a/gymkhana/items/inventory/turno_cocina_bol.tscn b/gymkhana/items/inventory/turno_cocina_bol.tscn index d8b98d1e..db2f9171 100644 --- a/gymkhana/items/inventory/turno_cocina_bol.tscn +++ b/gymkhana/items/inventory/turno_cocina_bol.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/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://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] diff --git a/gymkhana/items/inventory/turno_cocina_bol_inventario.tscn b/gymkhana/items/inventory/turno_cocina_bol_inventario.tscn index 9cdb2053..4d676ba7 100644 --- a/gymkhana/items/inventory/turno_cocina_bol_inventario.tscn +++ b/gymkhana/items/inventory/turno_cocina_bol_inventario.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/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://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] diff --git a/gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn b/gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn index 31ddc18e..266238e5 100644 --- a/gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn +++ b/gymkhana/items/inventory/turno_cocina_bol_lentejas.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/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://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] diff --git a/gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.tscn b/gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.tscn index 8a334020..5ebda99e 100644 --- a/gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.tscn +++ b/gymkhana/items/inventory/turno_cocina_bol_lentejas_agua.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/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://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] diff --git a/gymkhana/items/inventory/turno_cocina_carton.tscn b/gymkhana/items/inventory/turno_cocina_carton.tscn index 0046a93e..cd8ee323 100644 --- a/gymkhana/items/inventory/turno_cocina_carton.tscn +++ b/gymkhana/items/inventory/turno_cocina_carton.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://gymkhana/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_inventario.png" type="Texture" id=3] diff --git a/gymkhana/items/inventory/turno_cocina_carton_encendido.tscn b/gymkhana/items/inventory/turno_cocina_carton_encendido.tscn index edd26ae9..2f21e1aa 100644 --- a/gymkhana/items/inventory/turno_cocina_carton_encendido.tscn +++ b/gymkhana/items/inventory/turno_cocina_carton_encendido.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://gymkhana/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] [node name="turno_cocina_carton_encendido" type="Area2D"] diff --git a/gymkhana/items/inventory/turno_cocina_cuchillo.tscn b/gymkhana/items/inventory/turno_cocina_cuchillo.tscn index d5cd6c2a..4de38e28 100644 --- a/gymkhana/items/inventory/turno_cocina_cuchillo.tscn +++ b/gymkhana/items/inventory/turno_cocina_cuchillo.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://gymkhana/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] [node name="turno_cocina_cuchillo" type="Area2D"] diff --git a/gymkhana/items/inventory/turno_cocina_cuerno.tscn b/gymkhana/items/inventory/turno_cocina_cuerno.tscn index 0fe37ed6..f456469d 100644 --- a/gymkhana/items/inventory/turno_cocina_cuerno.tscn +++ b/gymkhana/items/inventory/turno_cocina_cuerno.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://gymkhana/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_inventario.png" type="Texture" id=3] diff --git a/gymkhana/items/inventory/turno_cocina_frontal.tscn b/gymkhana/items/inventory/turno_cocina_frontal.tscn index 2606ebe3..fbad8836 100644 --- a/gymkhana/items/inventory/turno_cocina_frontal.tscn +++ b/gymkhana/items/inventory/turno_cocina_frontal.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/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://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] diff --git a/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn b/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn index 20cb5e4d..8c1c2957 100644 --- a/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn +++ b/gymkhana/items/inventory/turno_cocina_libro_de_cocina.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://gymkhana/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] [node name="turno_cocina_libro_de_cocina" type="Area2D"] diff --git a/gymkhana/items/inventory/turno_cocina_madera.tscn b/gymkhana/items/inventory/turno_cocina_madera.tscn index 6b19671f..8db75935 100644 --- a/gymkhana/items/inventory/turno_cocina_madera.tscn +++ b/gymkhana/items/inventory/turno_cocina_madera.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/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://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] diff --git a/gymkhana/items/inventory/turno_cocina_mechero.tscn b/gymkhana/items/inventory/turno_cocina_mechero.tscn index d93a5394..6275e0bc 100644 --- a/gymkhana/items/inventory/turno_cocina_mechero.tscn +++ b/gymkhana/items/inventory/turno_cocina_mechero.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://gymkhana/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] [node name="turno_cocina_mechero" type="Area2D"] diff --git a/gymkhana/items/inventory/turno_cocina_olla_llena.tscn b/gymkhana/items/inventory/turno_cocina_olla_llena.tscn index 5271da5c..db31ee33 100644 --- a/gymkhana/items/inventory/turno_cocina_olla_llena.tscn +++ b/gymkhana/items/inventory/turno_cocina_olla_llena.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://gymkhana/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.png" type="Texture" id=3] [ext_resource path="res://gymkhana/particles/SmokeParticles.tscn" type="PackedScene" id=4] diff --git a/gymkhana/items/inventory/turno_cocina_olla_vacia.tscn b/gymkhana/items/inventory/turno_cocina_olla_vacia.tscn index bd6f1899..9c0b35a4 100644 --- a/gymkhana/items/inventory/turno_cocina_olla_vacia.tscn +++ b/gymkhana/items/inventory/turno_cocina_olla_vacia.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://gymkhana/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.png" type="Texture" id=3] diff --git a/gymkhana/items/inventory/turno_cocina_patata.tscn b/gymkhana/items/inventory/turno_cocina_patata.tscn index 8e13cff7..7d2dfe49 100644 --- a/gymkhana/items/inventory/turno_cocina_patata.tscn +++ b/gymkhana/items/inventory/turno_cocina_patata.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/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://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] diff --git a/gymkhana/items/inventory/turno_cocina_patata_grande.tscn b/gymkhana/items/inventory/turno_cocina_patata_grande.tscn index a4aa9dbf..60e59679 100644 --- a/gymkhana/items/inventory/turno_cocina_patata_grande.tscn +++ b/gymkhana/items/inventory/turno_cocina_patata_grande.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://gymkhana/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] [node name="turno_cocina_patata_grande" type="Area2D"] diff --git a/gymkhana/items/inventory/turno_cocina_peso.tscn b/gymkhana/items/inventory/turno_cocina_peso.tscn index 45c38851..787e4dd2 100644 --- a/gymkhana/items/inventory/turno_cocina_peso.tscn +++ b/gymkhana/items/inventory/turno_cocina_peso.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://gymkhana/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_inventario.png" type="Texture" id=3] diff --git a/gymkhana/items/inventory/turno_cocina_peso_bol.tscn b/gymkhana/items/inventory/turno_cocina_peso_bol.tscn index b9403a32..ddc3948a 100644 --- a/gymkhana/items/inventory/turno_cocina_peso_bol.tscn +++ b/gymkhana/items/inventory/turno_cocina_peso_bol.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/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://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] diff --git a/gymkhana/items/inventory/turno_cocina_peso_inventario.tscn b/gymkhana/items/inventory/turno_cocina_peso_inventario.tscn index 1506881e..94a2630c 100644 --- a/gymkhana/items/inventory/turno_cocina_peso_inventario.tscn +++ b/gymkhana/items/inventory/turno_cocina_peso_inventario.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/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://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] diff --git a/gymkhana/items/inventory/turno_cocina_romero.tscn b/gymkhana/items/inventory/turno_cocina_romero.tscn index bb262ce4..e601d7ca 100644 --- a/gymkhana/items/inventory/turno_cocina_romero.tscn +++ b/gymkhana/items/inventory/turno_cocina_romero.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://gymkhana/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] [node name="turno_cocina_romero" type="Area2D"] diff --git a/gymkhana/items/inventory/turno_cocina_salero.tscn b/gymkhana/items/inventory/turno_cocina_salero.tscn index 68175d7c..a9551bea 100644 --- a/gymkhana/items/inventory/turno_cocina_salero.tscn +++ b/gymkhana/items/inventory/turno_cocina_salero.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/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://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index 0f7ea670..4e11e871 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/background.png" type="Texture" 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_location.gd" type="Script" id=5] -[ext_resource path="res://gymkhana/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/foreground-mesa.png" type="Texture" id=8] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/foreground-silla.png" type="Texture" id=9] diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn index 5942cc76..7e0feb2e 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png" type="Texture" 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_location.gd" type="Script" id=5] -[ext_resource path="res://gymkhana/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/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] diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn index b2424f38..5925141f 100644 --- a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/background.jpg" type="Texture" 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_location.gd" type="Script" id=5] -[ext_resource path="res://gymkhana/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/columna.png" type="Texture" id=8] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_vacia.tscn" type="PackedScene" id=9] diff --git a/gymkhana/rooms/turno_cocina/despensa/despensa.tscn b/gymkhana/rooms/turno_cocina/despensa/despensa.tscn index 36863f73..a93d03e8 100644 --- a/gymkhana/rooms/turno_cocina/despensa/despensa.tscn +++ b/gymkhana/rooms/turno_cocina/despensa/despensa.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://gymkhana/rooms/turno_cocina/despensa/assets/background.png" type="Texture" 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_location.gd" type="Script" id=5] -[ext_resource path="res://gymkhana/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/rooms/turno_cocina/despensa/assets/columna.png" type="Texture" id=8] diff --git a/project.godot b/project.godot index f5244fa6..67854336 100644 --- a/project.godot +++ b/project.godot @@ -189,6 +189,11 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_dialog.gd" }, { +"base": "ESCLocation", +"class": "ESCDialogLocation", +"language": "GDScript", +"path": "res://addons/escoria-core/game/core-scripts/esc_dialog_location.gd" +}, { "base": "Control", "class": "ESCDialogManager", "language": "GDScript", @@ -254,6 +259,11 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/escoria-core/game/esc_inputs_manager.gd" }, { +"base": "ESCLocation", +"class": "ESCInteractionLocation", +"language": "GDScript", +"path": "res://addons/escoria-core/game/core-scripts/esc_interaction_location.gd" +}, { "base": "Control", "class": "ESCInventory", "language": "GDScript", @@ -272,7 +282,7 @@ _global_script_classes=[ { "base": "Reference", "class": "ESCInventoryItem", "language": "GDScript", -"path": "res://addons/escoria-core/game/core-scripts/esc_inventory_item.gd" +"path": "res://addons/escoria-ui-return-monkey-island/overrides/esc_inventory_item.gd" }, { "base": "Resource", "class": "ESCInventoryManager", @@ -389,17 +399,12 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc_room.gd" }, { -"base": "Reference", -"class": "ESCRoomContainer", -"language": "GDScript", -"path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_room_container.gd" -}, { "base": "Resource", "class": "ESCRoomManager", "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc/esc_room_manager.gd" }, { -"base": "ESCRoomContainer", +"base": "Reference", "class": "ESCRoomObjects", "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_room_objects.gd" @@ -409,11 +414,6 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_room_objects_key.gd" }, { -"base": "ESCRoomContainer", -"class": "ESCRoomTerrains", -"language": "GDScript", -"path": "res://addons/escoria-core/game/core-scripts/esc/types/esc_room_terrains.gd" -}, { "base": "Resource", "class": "ESCSaveGame", "language": "GDScript", @@ -590,16 +590,6 @@ _global_script_classes=[ { "path": "res://addons/escoria-core/game/core-scripts/esc/commands/repeat.gd" }, { "base": "ESCBaseCommand", -"class": "SaveGameCommand", -"language": "GDScript", -"path": "res://addons/escoria-core/game/core-scripts/esc/commands/save_game.gd" -}, { -"base": "Reference", -"class": "SaveGamesSorter", -"language": "GDScript", -"path": "res://addons/escoria-core/ui_library/menus/load_save/SaveGamesSorter.gd" -}, { -"base": "ESCBaseCommand", "class": "SayCommand", "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc/commands/say.gd" @@ -645,11 +635,6 @@ _global_script_classes=[ { "path": "res://addons/escoria-core/game/core-scripts/esc/commands/set_animations.gd" }, { "base": "ESCBaseCommand", -"class": "SetDirectionCommand", -"language": "GDScript", -"path": "res://addons/escoria-core/game/core-scripts/esc/commands/set_direction.gd" -}, { -"base": "ESCBaseCommand", "class": "SetGlobalCommand", "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc/commands/set_global.gd" @@ -689,11 +674,6 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc/commands/show_menu.gd" }, { -"base": "Resource", -"class": "SimpleDialogSettings", -"language": "GDScript", -"path": "res://addons/escoria-dialog-simple/esc_dialog_simple_settings.gd" -}, { "base": "SlideCommand", "class": "SlideBlockCommand", "language": "GDScript", @@ -811,6 +791,7 @@ _global_script_class_icons={ "ESCCompiler": "", "ESCCondition": "", "ESCDialog": "", +"ESCDialogLocation": "res://addons/escoria-core/design/esc_location.svg", "ESCDialogManager": "", "ESCDialogOption": "", "ESCDialogOptionsChooser": "", @@ -824,6 +805,7 @@ _global_script_class_icons={ "ESCGlobalsManager": "", "ESCGroup": "", "ESCInputsManager": "", +"ESCInteractionLocation": "res://addons/escoria-core/design/esc_location.svg", "ESCInventory": "", "ESCInventoryButton": "", "ESCInventoryContainer": "", @@ -844,18 +826,16 @@ _global_script_class_icons={ "ESCObject": "", "ESCObjectManager": "", "ESCPlayer": "res://addons/escoria-core/design/esc_player.svg", -"ESCPlayerWithTooltip": "res://addons/escoria-core/design/esc_player.svg", +"ESCPlayerWithTooltip": "", "ESCProjectSettingsManager": "", "ESCResourceCache": "", "ESCResourceDescriptor": "", "ESCReturnToMonekyIslandDialogs": "", "ESCRichTooltip": "", "ESCRoom": "res://addons/escoria-core/design/esc_room.svg", -"ESCRoomContainer": "", "ESCRoomManager": "", "ESCRoomObjects": "", "ESCRoomObjectsKey": "", -"ESCRoomTerrains": "", "ESCSaveGame": "", "ESCSaveManager": "", "ESCSaveSettings": "", @@ -879,7 +859,7 @@ _global_script_class_icons={ "InventoryAddCommand": "", "InventoryRemoveCommand": "", "ItemCountAddCommand": "", -"ItemOutline": "res://addons/escoria-core/design/esc_item.svg", +"ItemOutline": "", "PlayLibSound": "", "PlaySndCommand": "", "PlayVideoCommand": "", @@ -891,8 +871,6 @@ _global_script_class_icons={ "RTMIUiSettings": "", "RandGlobalCommand": "", "RepeatCommand": "", -"SaveGameCommand": "", -"SaveGamesSorter": "", "SayCommand": "", "SayLastDialogOptionCommand": "", "SayRandomCommand": "", @@ -902,7 +880,6 @@ _global_script_class_icons={ "SetActiveIfExistsCommand": "", "SetAngleCommand": "", "SetAnimationsCommand": "", -"SetDirectionCommand": "", "SetGlobalCommand": "", "SetGlobalsCommand": "", "SetGuiVisibleCommand": "", @@ -911,7 +888,6 @@ _global_script_class_icons={ "SetStateCommand": "", "SetTooltipCommand": "", "ShowMenuCommand": "", -"SimpleDialogSettings": "", "SlideBlockCommand": "", "SlideCommand": "", "SpawnCommand": "", @@ -962,7 +938,7 @@ search_in_file_extensions=PoolStringArray( "gd", "shader", "esc" ) [editor_plugins] -enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-ui-return-monkey-island/plugin.cfg", "res://addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg", "res://addons/escoria-wizard/plugin.cfg" ) +enabled=PoolStringArray( "res://addons/escoria-core/plugin.cfg", "res://addons/escoria-ui-return-monkey-island/plugin.cfg", "res://addons/escoria-ui-return-monkey-island-dialog-simple/plugin.cfg" ) [escoria] diff --git a/scripts/item-template.tscn b/scripts/item-template.tscn index 7329c3c4..a62fc3ce 100644 --- a/scripts/item-template.tscn +++ b/scripts/item-template.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://gymkhana/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://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3]