diff --git a/addons/escoria-core/game/esc_project_settings_manager.gd b/addons/escoria-core/game/esc_project_settings_manager.gd index 7bcdab6c..700d5577 100644 --- a/addons/escoria-core/game/esc_project_settings_manager.gd +++ b/addons/escoria-core/game/esc_project_settings_manager.gd @@ -14,7 +14,7 @@ const DEFAULT_TRANSITION = "%s/%s/default_transition" % [_ESCORIA_SETTINGS_ROOT, const DIALOG_MANAGERS = "%s/%s/dialog_managers" % [_ESCORIA_SETTINGS_ROOT, _UI_ROOT] const GAME_SCENE = "%s/%s/game_scene" % [_ESCORIA_SETTINGS_ROOT, _UI_ROOT] const INVENTORY_ITEM_SIZE = "%s/%s/inventory_item_size" % [_ESCORIA_SETTINGS_ROOT, _UI_ROOT] -const ITEMS_AUTOREGISTER_PATH = "%s/%s/items_autoregister_path" % [_ESCORIA_SETTINGS_ROOT, _UI_ROOT] +const INVENTORY_ITEMS_PATH = "%s/%s/inventory_items_path" % [_ESCORIA_SETTINGS_ROOT, _UI_ROOT] const TRANSITION_PATHS = "%s/%s/transition_paths" % [_ESCORIA_SETTINGS_ROOT, _UI_ROOT] # Main Escoria project settings diff --git a/addons/escoria-core/game/scenes/inventory/inventory_ui.gd b/addons/escoria-core/game/scenes/inventory/inventory_ui.gd index afd264da..b596bf4b 100644 --- a/addons/escoria-core/game/scenes/inventory/inventory_ui.gd +++ b/addons/escoria-core/game/scenes/inventory/inventory_ui.gd @@ -44,7 +44,7 @@ func add_new_item_by_id(item_id: String) -> void: escoria.object_manager.get_object(item_id).node): var inventory_file = "%s/%s.tscn" % [ ESCProjectSettingsManager.get_setting( - ESCProjectSettingsManager.ITEMS_AUTOREGISTER_PATH + ESCProjectSettingsManager.INVENTORY_ITEMS_PATH ).trim_suffix("/"), item_id ] @@ -68,9 +68,9 @@ func add_new_item_by_id(item_id: String) -> void: % [ item_id, inventory_file, - ESCProjectSettingsManager.ITEMS_AUTOREGISTER_PATH, + ESCProjectSettingsManager.INVENTORY_ITEMS_PATH, ESCProjectSettingsManager.get_setting( - ESCProjectSettingsManager.ITEMS_AUTOREGISTER_PATH + ESCProjectSettingsManager.INVENTORY_ITEMS_PATH ) ] ) diff --git a/addons/escoria-core/plugin.gd b/addons/escoria-core/plugin.gd index d10e44b5..37cba30e 100644 --- a/addons/escoria-core/plugin.gd +++ b/addons/escoria-core/plugin.gd @@ -92,10 +92,10 @@ func set_escoria_ui_settings(): ) register_setting( - ESCProjectSettingsManager.ITEMS_AUTOREGISTER_PATH, + ESCProjectSettingsManager.INVENTORY_ITEMS_PATH, "res://game/items/inventory/", { - "name": ESCProjectSettingsManager.ITEMS_AUTOREGISTER_PATH, + "name": ESCProjectSettingsManager.INVENTORY_ITEMS_PATH, "type": TYPE_STRING, "hint": PROPERTY_HINT_DIR } diff --git a/game/rooms/room05/room05.tscn b/game/rooms/room05/room05.tscn index f67cafc0..0ac99be9 100644 --- a/game/rooms/room05/room05.tscn +++ b/game/rooms/room05/room05.tscn @@ -106,7 +106,7 @@ margin_right = 580.0 margin_bottom = 301.0 custom_fonts/font = ExtResource( 3 ) text = "One of the settings inside Godot's settings is -\"Escoria/UI/Items autoregister path\". +\"Escoria/UI/Inventory Items path\". Inventory items need to be ESCItems saved as scenes, and these scenes need to be located in this path. If you use the command \"inventory_add xyz\", this will diff --git a/project.godot b/project.godot index 13a156ba..8cdaf941 100644 --- a/project.godot +++ b/project.godot @@ -763,7 +763,7 @@ debug/crash_message="We're sorry, but the game crashed. Please send us the follo debug/enable_room_selector=true debug/room_selector_room_dir="res://game/rooms" ui/game_scene="res://addons/escoria-ui-9verbs/game.tscn" -ui/items_autoregister_path="res://game/items/inventory" +ui/inventory_items_path="res://game/items/inventory" ui/default_transition="instant" ui/transition_paths=[ "res://addons/escoria-core/game/scenes/transitions/shaders/" ] ui/inventory_item_size=Vector2( 72, 72 )