oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

chore: renames items_autoregister_path to inventory_items_path (#620)

Browse Source 
Co-authored-by: Balloonpopper <balloonpopper@git.com>
This commit is contained in:
balloonpopper
2022-08-09 16:11:36 +10:00
committed by GitHub
parent 0b7f1b4564
commit c9e785142f
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/escoria-core/game/esc_project_settings_manager.gd
View File

@@ -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 DIALOG_MANAGERS = "%s/%s/dialog_managers" % [_ESCORIA_SETTINGS_ROOT, _UI_ROOT]
const GAME_SCENE = "%s/%s/game_scene" % [_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 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] const TRANSITION_PATHS = "%s/%s/transition_paths" % [_ESCORIA_SETTINGS_ROOT, _UI_ROOT]
# Main Escoria project settings # Main Escoria project settings

6
addons/escoria-core/game/scenes/inventory/inventory_ui.gd
View File

@@ -44,7 +44,7 @@ func add_new_item_by_id(item_id: String) -> void:
escoria.object_manager.get_object(item_id).node): escoria.object_manager.get_object(item_id).node):
var inventory_file = "%s/%s.tscn" % [ var inventory_file = "%s/%s.tscn" % [
ESCProjectSettingsManager.get_setting( ESCProjectSettingsManager.get_setting(
ESCProjectSettingsManager.ITEMS_AUTOREGISTER_PATH ESCProjectSettingsManager.INVENTORY_ITEMS_PATH
).trim_suffix("/"), ).trim_suffix("/"),
item_id item_id
] ]
@@ -68,9 +68,9 @@ func add_new_item_by_id(item_id: String) -> void:
% [ % [
item_id, item_id,
inventory_file, inventory_file,
ESCProjectSettingsManager.ITEMS_AUTOREGISTER_PATH, ESCProjectSettingsManager.INVENTORY_ITEMS_PATH,
ESCProjectSettingsManager.get_setting( ESCProjectSettingsManager.get_setting(
ESCProjectSettingsManager.ITEMS_AUTOREGISTER_PATH ESCProjectSettingsManager.INVENTORY_ITEMS_PATH
) )
] ]
) )

4
addons/escoria-core/plugin.gd
View File

@@ -92,10 +92,10 @@ func set_escoria_ui_settings():
) )
register_setting( register_setting(
ESCProjectSettingsManager.ITEMS_AUTOREGISTER_PATH, ESCProjectSettingsManager.INVENTORY_ITEMS_PATH,
"res://game/items/inventory/", "res://game/items/inventory/",
{ {
"name": ESCProjectSettingsManager.ITEMS_AUTOREGISTER_PATH, "name": ESCProjectSettingsManager.INVENTORY_ITEMS_PATH,
"type": TYPE_STRING, "type": TYPE_STRING,
"hint": PROPERTY_HINT_DIR "hint": PROPERTY_HINT_DIR
} }

2
game/rooms/room05/room05.tscn
View File

@@ -106,7 +106,7 @@ margin_right = 580.0
margin_bottom = 301.0 margin_bottom = 301.0
custom_fonts/font = ExtResource( 3 ) custom_fonts/font = ExtResource( 3 )
text = "One of the settings inside Godot's settings is 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 Inventory items need to be ESCItems saved as
scenes, and these scenes need to be located in this path. scenes, and these scenes need to be located in this path.
If you use the command \"inventory_add xyz\", this will If you use the command \"inventory_add xyz\", this will

2
project.godot
View File

@@ -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/enable_room_selector=true
debug/room_selector_room_dir="res://game/rooms" debug/room_selector_room_dir="res://game/rooms"
ui/game_scene="res://addons/escoria-ui-9verbs/game.tscn" 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/default_transition="instant"
ui/transition_paths=[ "res://addons/escoria-core/game/scenes/transitions/shaders/" ] ui/transition_paths=[ "res://addons/escoria-core/game/scenes/transitions/shaders/" ]
ui/inventory_item_size=Vector2( 72, 72 ) ui/inventory_item_size=Vector2( 72, 72 )