diff --git a/addons/resources_spreadsheet_view/editor_view.gd b/addons/resources_spreadsheet_view/editor_view.gd index 34bb525..32a1c89 100644 --- a/addons/resources_spreadsheet_view/editor_view.gd +++ b/addons/resources_spreadsheet_view/editor_view.gd @@ -14,7 +14,7 @@ const TablesPluginSettingsClass := preload("res://addons/resources_spreadsheet_v @onready var _on_cell_gui_input : Callable = $"InputHandler"._on_cell_gui_input @onready var _selection := $"SelectionManager" -var editor_interface : EditorInterface +var editor_interface : Object var editor_plugin : EditorPlugin var current_path := "" @@ -28,6 +28,7 @@ var column_hints := [] var column_hint_strings := [] var rows := [] var remembered_paths := {} +var remembered_paths_total_count := 0 var table_functions_dict := {} var search_cond : RefCounted @@ -56,19 +57,8 @@ func _ready(): func _on_filesystem_changed(): - var editor_fs := editor_interface.get_resource_filesystem() - var path := editor_fs.get_filesystem_path(current_path) - if !path: return - - var file_total_count := 0 - var folder_stack : Array[EditorFileSystemDirectory] = [path] - while folder_stack.size() > 0: - path = folder_stack.pop_back() - file_total_count += path.get_file_count() - for i in path.get_subdir_count(): - folder_stack.append(path.get_subdir(i)) - - if file_total_count != remembered_paths.size(): + var file_total_count := _get_file_count_recursive(current_path) + if file_total_count != remembered_paths_total_count: refresh() else: @@ -84,6 +74,22 @@ func _on_filesystem_changed(): break +func _get_file_count_recursive(path : String) -> int: + var editor_fs : EditorFileSystem = editor_interface.get_resource_filesystem() + var path_dir := editor_fs.get_filesystem_path(path) + if !path_dir: return 0 + + var file_total_count := 0 + var folder_stack : Array[EditorFileSystemDirectory] = [path_dir] + while folder_stack.size() > 0: + path_dir = folder_stack.pop_back() + file_total_count += path_dir.get_file_count() + for i in path_dir.get_subdir_count(): + folder_stack.append(path_dir.get_subdir(i)) + + return file_total_count + + func display_folder(folderpath : String, sort_by : String = "", sort_reverse : bool = false, force_rebuild : bool = false, is_echo : bool = false): if folderpath == "": return # Root folder resources tend to have MANY properties. $"HeaderContentSplit/MarginContainer/FooterContentSplit/Panel/Label".visible = false @@ -107,9 +113,9 @@ func display_folder(folderpath : String, sort_by : String = "", sort_reverse : b or columns.size() != node_columns.get_child_count() ) current_path = folderpath + remembered_paths_total_count = _get_file_count_recursive(folderpath) node_columns.update() - - emit_signal("grid_updated") + grid_updated.emit() func refresh(force_rebuild : bool = true): @@ -129,6 +135,7 @@ func _load_resources_from_path(path : String, sort_by : String, sort_reverse : b io = ResourceTablesEditFormatTres.new() io.editor_view = self + remembered_paths.clear() rows = io.import_from_path(path, insert_row_sorted, sort_by, sort_reverse) @@ -152,7 +159,7 @@ func fill_property_data(res): func insert_row_sorted(res : Resource, rows : Array, sort_by : String, sort_reverse : bool): - if search_cond != null && !search_cond.can_show(res, rows.size()): + if search_cond != null and !search_cond.can_show(res, rows.size()): return for i in rows.size(): @@ -160,6 +167,7 @@ func insert_row_sorted(res : Resource, rows : Array, sort_by : String, sort_reve rows.insert(i, res) return + remembered_paths[res.resource_path] = res rows.append(res) diff --git a/addons/resources_spreadsheet_view/editor_view.tscn b/addons/resources_spreadsheet_view/editor_view.tscn index 6795d5e..ba72f7d 100644 --- a/addons/resources_spreadsheet_view/editor_view.tscn +++ b/addons/resources_spreadsheet_view/editor_view.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=3 uid="uid://6hq6kl8xvfo6"] +[gd_scene load_steps=30 format=3 uid="uid://tmleonv20aqk"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/editor_view.gd" id="1_wfx75"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/editor_color_setter.gd" id="2_t2s7k"] @@ -7,16 +7,16 @@ [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/main_screen/expression_textfield.gd" id="5_faq75"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/main_screen/table_pages.gd" id="5_ka2yn"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/main_screen/column_header_manager.gd" id="6_emnmd"] -[ext_resource type="PackedScene" uid="uid://clg4aogkyuayk" path="res://addons/resources_spreadsheet_view/main_screen/table_header.tscn" id="7_3dx0v"] -[ext_resource type="PackedScene" uid="uid://crfuon34lnst0" path="res://addons/resources_spreadsheet_view/typed_editors/dock_enum_array.tscn" id="8_234wn"] -[ext_resource type="PackedScene" uid="uid://d10f70g3boclo" path="res://addons/resources_spreadsheet_view/typed_editors/dock_array.tscn" id="9_nts08"] -[ext_resource type="PackedScene" uid="uid://cvx3xw8w77jba" path="res://addons/resources_spreadsheet_view/typed_editors/dock_color.tscn" id="10_nsma2"] -[ext_resource type="PackedScene" uid="uid://bafpct0bu5h5r" path="res://addons/resources_spreadsheet_view/typed_editors/dock_number.tscn" id="11_q1ao4"] -[ext_resource type="PackedScene" uid="uid://boraogt0aj5no" path="res://addons/resources_spreadsheet_view/typed_editors/dock_texture.tscn" id="12_4kr6q"] -[ext_resource type="PackedScene" uid="uid://bwxogyjske87v" path="res://addons/resources_spreadsheet_view/settings_grid.tscn" id="13_as1sh"] -[ext_resource type="PackedScene" uid="uid://x5gffbaf8k2v" path="res://addons/resources_spreadsheet_view/typed_editors/dock_dict.tscn" id="13_il556"] +[ext_resource type="PackedScene" uid="uid://d1s6oihqedvo5" path="res://addons/resources_spreadsheet_view/main_screen/table_header.tscn" id="7_3dx0v"] +[ext_resource type="PackedScene" uid="uid://ddqak780cwwfj" path="res://addons/resources_spreadsheet_view/typed_editors/dock_enum_array.tscn" id="8_234wn"] +[ext_resource type="PackedScene" uid="uid://c3a2cip8ffccv" path="res://addons/resources_spreadsheet_view/typed_editors/dock_array.tscn" id="9_nts08"] +[ext_resource type="PackedScene" uid="uid://b3a3bo6cfyh5t" path="res://addons/resources_spreadsheet_view/typed_editors/dock_color.tscn" id="10_nsma2"] +[ext_resource type="PackedScene" uid="uid://gtbf7b0wptv" path="res://addons/resources_spreadsheet_view/typed_editors/dock_number.tscn" id="11_q1ao4"] +[ext_resource type="PackedScene" uid="uid://rww3gpl052bn" path="res://addons/resources_spreadsheet_view/typed_editors/dock_texture.tscn" id="12_4kr6q"] +[ext_resource type="PackedScene" uid="uid://dhunxgcae6h1" path="res://addons/resources_spreadsheet_view/settings_grid.tscn" id="13_as1sh"] +[ext_resource type="PackedScene" uid="uid://p6x03dbvhnqw" path="res://addons/resources_spreadsheet_view/typed_editors/dock_dict.tscn" id="13_il556"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/main_screen/input_handler.gd" id="14_2t57a"] -[ext_resource type="PackedScene" uid="uid://dirhdjj3wh0j0" path="res://addons/resources_spreadsheet_view/import_export/import_export_dialog.tscn" id="14_3p12b"] +[ext_resource type="PackedScene" uid="uid://b413igx28kkvb" path="res://addons/resources_spreadsheet_view/import_export/import_export_dialog.tscn" id="14_3p12b"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/main_screen/selection_manager.gd" id="15_mx6qn"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/typed_cells/cell_editor_enum_array.gd" id="16_p7n52"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/typed_cells/cell_editor_array.gd" id="17_sofdw"] @@ -26,7 +26,7 @@ [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/typed_cells/cell_editor_enum.gd" id="20_swsbn"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/typed_cells/cell_editor_resource.gd" id="21_58wf8"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/typed_cells/cell_editor_string.gd" id="22_bni8r"] -[ext_resource type="PackedScene" uid="uid://dipn3x8uhq8vp" path="res://addons/resources_spreadsheet_view/main_screen/selection_actions.tscn" id="23_m53sx"] +[ext_resource type="PackedScene" uid="uid://b51hnttsie7k5" path="res://addons/resources_spreadsheet_view/main_screen/selection_actions.tscn" id="23_m53sx"] [sub_resource type="Gradient" id="Gradient_8kp6w"] offsets = PackedFloat32Array(0, 0.995413, 1) @@ -520,6 +520,7 @@ min_size = Vector2i(500, 300) [node name="ImportExport" type="Window" parent="Control"] process_mode = 3 +initial_position = 4 size = Vector2i(600, 400) visible = false transient = true @@ -567,5 +568,6 @@ metadata/_edit_lock_ = true [connection signal="file_selected" from="Control/FileDialog" to="." method="_on_FileDialog_dir_selected"] [connection signal="dir_selected" from="Control/FileDialogText" to="Control/ImportExport/ImportExport" method="_on_file_selected"] [connection signal="file_selected" from="Control/FileDialogText" to="Control/ImportExport/ImportExport" method="_on_file_selected"] +[connection signal="close_requested" from="Control/ImportExport" to="Control/ImportExport" method="hide"] [connection signal="cells_rightclicked" from="SelectionManager" to="Control/SelectionActions" method="_on_grid_cells_rightclicked"] [connection signal="cells_selected" from="SelectionManager" to="Control/SelectionActions" method="_on_grid_cells_selected"] diff --git a/addons/resources_spreadsheet_view/import_export/formats_edit/edit_tres.gd b/addons/resources_spreadsheet_view/import_export/formats_edit/edit_tres.gd index 2128663..6dd301e 100644 --- a/addons/resources_spreadsheet_view/import_export/formats_edit/edit_tres.gd +++ b/addons/resources_spreadsheet_view/import_export/formats_edit/edit_tres.gd @@ -57,7 +57,6 @@ func import_from_path(folderpath : String, insert_func : Callable, sort_by : Str var dir := DirAccess.open(folderpath) if dir == null: return [] - editor_view.remembered_paths.clear() var cur_dir_types : Dictionary = {} var file_stack : Array[String] = [] @@ -85,8 +84,6 @@ func import_from_path(folderpath : String, insert_func : Callable, sort_by : Str if res_script != null: cur_dir_types[res_script] = cur_dir_types.get(res_script, 0) + 1 - editor_view.remembered_paths[file_stack[i]] = res - var most_count_key = null var most_count_count := 0 var most_count_is_base_class := false diff --git a/addons/resources_spreadsheet_view/import_export/formats_import/import_csv.gd b/addons/resources_spreadsheet_view/import_export/formats_import/import_csv.gd index 77395d0..6555b86 100644 --- a/addons/resources_spreadsheet_view/import_export/formats_import/import_csv.gd +++ b/addons/resources_spreadsheet_view/import_export/formats_import/import_csv.gd @@ -17,10 +17,15 @@ static func import_as_arrays(import_data) -> Array: var text_lines := [file.get_line().split(import_data.delimeter)] var space_after_delimeter = false var line = text_lines[0] + if line.size() == 0: + return [] + if line.size() == 1: import_data.delimeter = "," line = line[0].split(import_data.delimeter) text_lines[0] = line + if line.size() <= 1: + return [] if line[1].begins_with(" "): for i in line.size(): diff --git a/addons/resources_spreadsheet_view/import_export/import_export_dialog.gd b/addons/resources_spreadsheet_view/import_export/import_export_dialog.gd index 361fdad..8732d2b 100644 --- a/addons/resources_spreadsheet_view/import_export/import_export_dialog.gd +++ b/addons/resources_spreadsheet_view/import_export/import_export_dialog.gd @@ -51,6 +51,7 @@ func _on_file_selected(path : String): import_data = ResourceTablesImport.new() import_data.initialize(path) _reset_controls() + await get_tree().process_frame _open_dialog(path) get_parent().popup_centered() position = Vector2.ZERO diff --git a/addons/resources_spreadsheet_view/import_export/import_export_dialog.tscn b/addons/resources_spreadsheet_view/import_export/import_export_dialog.tscn index ed6e1ec..d3de473 100644 --- a/addons/resources_spreadsheet_view/import_export/import_export_dialog.tscn +++ b/addons/resources_spreadsheet_view/import_export/import_export_dialog.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=7 format=3 uid="uid://dirhdjj3wh0j0"] +[gd_scene load_steps=7 format=3 uid="uid://b413igx28kkvb"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/import_export/import_export_dialog.gd" id="1"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/import_export/formats_export/export_csv.gd" id="2_33c6s"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/import_export/formats_import/import_csv.gd" id="2_fxayt"] -[ext_resource type="PackedScene" uid="uid://b8q6wn3cxsvb" path="res://addons/resources_spreadsheet_view/import_export/property_list_item.tscn" id="2_xfhmf"] -[ext_resource type="PackedScene" uid="uid://bf71ybtj6q6t3" path="res://addons/resources_spreadsheet_view/import_export/import_export_enum_format.tscn" id="4"] +[ext_resource type="PackedScene" uid="uid://b8llymigbprh6" path="res://addons/resources_spreadsheet_view/import_export/property_list_item.tscn" id="2_xfhmf"] +[ext_resource type="PackedScene" uid="uid://ckhf3bqy2rqjr" path="res://addons/resources_spreadsheet_view/import_export/import_export_enum_format.tscn" id="4"] [sub_resource type="ButtonGroup" id="ButtonGroup_080hd"] @@ -14,11 +14,10 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -use_hidden_tabs_for_min_size = true script = ExtResource("1") prop_list_item_scene = ExtResource("2_xfhmf") -formats_export = [ExtResource("2_33c6s")] -formats_import = [ExtResource("2_fxayt")] +formats_export = Array[Script]([ExtResource("2_33c6s")]) +formats_import = Array[Script]([ExtResource("2_fxayt")]) [node name="Import" type="VBoxContainer" parent="."] layout_mode = 2 @@ -30,6 +29,7 @@ size_flags_vertical = 3 [node name="Scroll" type="ScrollContainer" parent="Import/Margins"] layout_mode = 2 +horizontal_scroll_mode = 0 [node name="Box" type="VBoxContainer" parent="Import/Margins/Scroll"] layout_mode = 2 @@ -184,6 +184,5 @@ layout_mode = 2 [connection signal="toggled" from="Export/Box/CheckBox" to="." method="_on_export_space_toggled"] [connection signal="toggled" from="Export/Box3/CheckBox" to="." method="_on_remove_first_row_toggled"] [connection signal="format_changed" from="Export/StyleSettingsE" to="." method="_on_enum_format_changed"] -[connection signal="format_changed" from="Export/StyleSettingsE" to="Import/Margins/Scroll/Box/StyleSettingsI" method="_on_format_changed"] [connection signal="pressed" from="Export/Box2/Button" to="." method="_on_export_csv_pressed"] [connection signal="pressed" from="Export/Box2/Cancel" to="." method="close"] diff --git a/addons/resources_spreadsheet_view/import_export/import_export_enum_format.tscn b/addons/resources_spreadsheet_view/import_export/import_export_enum_format.tscn index 54e937f..39ec94a 100644 --- a/addons/resources_spreadsheet_view/import_export/import_export_enum_format.tscn +++ b/addons/resources_spreadsheet_view/import_export/import_export_enum_format.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=2 format=3 uid="uid://bf71ybtj6q6t3"] +[gd_scene load_steps=2 format=3 uid="uid://ckhf3bqy2rqjr"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/import_export/import_export_enum_format.gd" id="1"] diff --git a/addons/resources_spreadsheet_view/import_export/property_list_item.tscn b/addons/resources_spreadsheet_view/import_export/property_list_item.tscn index a82b3c0..75172d5 100644 --- a/addons/resources_spreadsheet_view/import_export/property_list_item.tscn +++ b/addons/resources_spreadsheet_view/import_export/property_list_item.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=2 format=3 uid="uid://b8q6wn3cxsvb"] +[gd_scene load_steps=2 format=3 uid="uid://b8llymigbprh6"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/import_export/property_list_item.gd" id="1"] diff --git a/addons/resources_spreadsheet_view/import_export/spreadsheet_import.gd b/addons/resources_spreadsheet_view/import_export/spreadsheet_import.gd index dc91f53..7b94cfe 100644 --- a/addons/resources_spreadsheet_view/import_export/spreadsheet_import.gd +++ b/addons/resources_spreadsheet_view/import_export/spreadsheet_import.gd @@ -280,7 +280,9 @@ static func get_resource_property_types(res : Resource, properties : Array) -> A if x["hint"] == PROPERTY_HINT_ENUM: var enum_values = x["hint_string"].split(",") for i in enum_values.size(): - enum_values[i] = enum_values[i].left(enum_values[i].find(":")) + var index_found : int = enum_values[i].find(":") + if index_found == -1: continue + enum_values[i] = enum_values[i].left(index_found) result[found] = enum_values diff --git a/addons/resources_spreadsheet_view/main_screen/selection_actions.gd b/addons/resources_spreadsheet_view/main_screen/selection_actions.gd index dd0f196..ae8766f 100644 --- a/addons/resources_spreadsheet_view/main_screen/selection_actions.gd +++ b/addons/resources_spreadsheet_view/main_screen/selection_actions.gd @@ -35,16 +35,11 @@ func _on_grid_cells_rightclicked(cells): func _on_grid_cells_selected(cells): - if ProjectSettings.get_setting(TablesPluginSettingsClass.PREFIX + "context_menu_on_leftclick"): - open(cells, true) + open(cells, true, true) - else: hide() - -func open(cells : Array, pin_to_cell : bool = false): - set_process_input(true) - set_process_unhandled_input(true) - if cells.size() == 0: +func open(cells : Array, pin_to_cell : bool = false, from_leftclick : bool = false): + if cells.size() == 0 or (from_leftclick and !ProjectSettings.get_setting(TablesPluginSettingsClass.PREFIX + "context_menu_on_leftclick")): hide() cell = null return @@ -68,17 +63,27 @@ func open(cells : Array, pin_to_cell : bool = false): func close(): - set_process_input(false) - set_process_unhandled_input(false) + pass -func _unhandled_input(event): +func _input(event : InputEvent): if !editor_view.is_visible_in_tree(): close() return - + + if event is InputEventMouseButton and event.is_pressed(): + close() + return + if event is InputEventKey: - if Input.is_key_pressed(KEY_CTRL): + if event.is_pressed() and event.is_command_or_control_pressed(): + global_position = get_global_mouse_position() + Vector2.ONE + if cell != null: + global_position = Vector2( + cell.global_position.x + cell.size.x, + cell.global_position.y + ) + # Dupe if event.keycode == KEY_D: _on_Duplicate_pressed() @@ -88,21 +93,7 @@ func _unhandled_input(event): if event.keycode == KEY_R: _on_Rename_pressed() return - - if event is InputEventMouseButton and event.is_pressed(): - close() - - -func _input(event): - if cell == null: return - if !editor_view.is_visible_in_tree(): - close() - return - global_position = Vector2( - cell.global_position.x + cell.size.x, - cell.global_position.y - ) func _on_Duplicate_pressed(): @@ -157,6 +148,7 @@ func _show_editbox(action): editbox_input.text = editor_view.get_last_selected_row()\ .resource_path.get_file().get_basename() + show() editbox_input.grab_focus() editbox_input.caret_column = 999999999 editbox_node.size = Vector2.ZERO diff --git a/addons/resources_spreadsheet_view/main_screen/selection_actions.tscn b/addons/resources_spreadsheet_view/main_screen/selection_actions.tscn index 1f1631d..e17318e 100644 --- a/addons/resources_spreadsheet_view/main_screen/selection_actions.tscn +++ b/addons/resources_spreadsheet_view/main_screen/selection_actions.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=7 format=3 uid="uid://dipn3x8uhq8vp"] +[gd_scene load_steps=7 format=3 uid="uid://b51hnttsie7k5"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/editor_icon_button.gd" id="1"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/main_screen/selection_actions.gd" id="1_qv6ov"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/editor_color_setter.gd" id="2_a4ihj"] -[sub_resource type="Image" id="Image_p3efe"] +[sub_resource type="Image" id="Image_1546g"] data = { "data": PackedByteArray(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0), "format": "LumAlpha8", @@ -14,7 +14,7 @@ data = { } [sub_resource type="ImageTexture" id="2"] -image = SubResource("Image_p3efe") +image = SubResource("Image_1546g") [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ydxuk"] content_margin_left = 4.0 diff --git a/addons/resources_spreadsheet_view/main_screen/selection_manager.gd b/addons/resources_spreadsheet_view/main_screen/selection_manager.gd index 7a3ecd4..4c0f4a2 100644 --- a/addons/resources_spreadsheet_view/main_screen/selection_manager.gd +++ b/addons/resources_spreadsheet_view/main_screen/selection_manager.gd @@ -210,7 +210,7 @@ func _update_selected_cells_text(): if edited_cells_text.size() == 0: return - var column_dtype := get_cell_column(editor_view.column_types[edited_cells[0]]) + var column_dtype : int = editor_view.column_types[get_cell_column(edited_cells[0])] for i in edited_cells.size(): edited_cells_text[i] = editor_view.try_convert(edited_cells[i].text, column_dtype) edit_cursor_positions[i] = edited_cells_text[i].length() diff --git a/addons/resources_spreadsheet_view/main_screen/table_header.tscn b/addons/resources_spreadsheet_view/main_screen/table_header.tscn index 3343faa..bd7fbb7 100644 --- a/addons/resources_spreadsheet_view/main_screen/table_header.tscn +++ b/addons/resources_spreadsheet_view/main_screen/table_header.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=3 format=3 uid="uid://clg4aogkyuayk"] +[gd_scene load_steps=3 format=3 uid="uid://d1s6oihqedvo5"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/main_screen/table_header.gd" id="1_5fd1m"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/editor_icon_button.gd" id="2_0ymob"] diff --git a/addons/resources_spreadsheet_view/plugin.gd b/addons/resources_spreadsheet_view/plugin.gd index a4345df..70549be 100644 --- a/addons/resources_spreadsheet_view/plugin.gd +++ b/addons/resources_spreadsheet_view/plugin.gd @@ -8,6 +8,10 @@ var undo_redo : EditorUndoRedoManager func _enter_tree() -> void: editor_view = load(get_script().resource_path.get_base_dir() + "/editor_view.tscn").instantiate() editor_view.editor_interface = get_editor_interface() + if editor_view.editor_interface == null: + # 4.2: now a singleton + editor_view.editor_interface = Engine.get_singleton("EditorInterface") + editor_view.editor_plugin = self undo_redo = get_undo_redo() get_editor_interface().get_editor_main_screen().add_child(editor_view) diff --git a/addons/resources_spreadsheet_view/saved_state.json b/addons/resources_spreadsheet_view/saved_state.json index 77c16da..5d742a9 100644 --- a/addons/resources_spreadsheet_view/saved_state.json +++ b/addons/resources_spreadsheet_view/saved_state.json @@ -1,38 +1,17 @@ { "hidden_columns": { - "res://config/attack/": { - "resource_local_to_scene": true, - "resource_name": true - }, - "res://config/character/": { - "resource_local_to_scene": true, - "resource_name": true, - "sprite_harf_height": true, - "sprite_width": true - }, - "res://config/character_move/": { - "resource_local_to_scene": true, - "resource_name": true - }, - "res://config/player_skill/": { + "res://config/skill_player_weapon/": { "animation_name": true, - "has_animation": true, "refresh_animation": true, "resource_local_to_scene": true, "resource_name": true, - "sprite_frams": true - }, - "res://example/Items/items/": { - "resource_local_to_scene": true, - "resource_name": true + "skill_animation": true, + "sprite_frames": true, + "weapon": true } }, "recent_paths": [ - "res://example/Items/items/", - "res://config/character/", - "res://config/player_skill/", - "res://config/attack/", - "res://config/character_move/" + "res://config/skill_player_weapon/" ], "table_functions": { "filter": [ diff --git a/addons/resources_spreadsheet_view/settings_grid.tscn b/addons/resources_spreadsheet_view/settings_grid.tscn index 4024583..ed692be 100644 --- a/addons/resources_spreadsheet_view/settings_grid.tscn +++ b/addons/resources_spreadsheet_view/settings_grid.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=2 format=3 uid="uid://bwxogyjske87v"] +[gd_scene load_steps=2 format=3 uid="uid://dhunxgcae6h1"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/settings_grid.gd" id="1_s8s2f"] diff --git a/addons/resources_spreadsheet_view/typed_cells/array.tscn b/addons/resources_spreadsheet_view/typed_cells/array.tscn index 7b5ba9b..61062ac 100644 --- a/addons/resources_spreadsheet_view/typed_cells/array.tscn +++ b/addons/resources_spreadsheet_view/typed_cells/array.tscn @@ -1,4 +1,4 @@ -[gd_scene format=3 uid="uid://dr55b6gkrmvhe"] +[gd_scene format=3 uid="uid://ydrs54md3knl"] [node name="Label" type="MarginContainer"] offset_right = 16.0 diff --git a/addons/resources_spreadsheet_view/typed_cells/basic.tscn b/addons/resources_spreadsheet_view/typed_cells/basic.tscn index 99797a4..541f1ba 100644 --- a/addons/resources_spreadsheet_view/typed_cells/basic.tscn +++ b/addons/resources_spreadsheet_view/typed_cells/basic.tscn @@ -1,4 +1,4 @@ -[gd_scene format=3 uid="uid://dnuok6y4j16e0"] +[gd_scene format=3 uid="uid://cghfjg6qt3rb1"] [node name="Label" type="Label"] offset_right = 20.0 diff --git a/addons/resources_spreadsheet_view/typed_cells/resource.tscn b/addons/resources_spreadsheet_view/typed_cells/resource.tscn index e609e8e..1372d02 100644 --- a/addons/resources_spreadsheet_view/typed_cells/resource.tscn +++ b/addons/resources_spreadsheet_view/typed_cells/resource.tscn @@ -1,4 +1,4 @@ -[gd_scene format=3 uid="uid://wgkae0g5wxh2"] +[gd_scene format=3 uid="uid://clcndgxaty503"] [node name="Label" type="MarginContainer"] size_flags_vertical = 9 diff --git a/addons/resources_spreadsheet_view/typed_editors/dock_array.tscn b/addons/resources_spreadsheet_view/typed_editors/dock_array.tscn index a2f5e9f..6d3ff29 100644 --- a/addons/resources_spreadsheet_view/typed_editors/dock_array.tscn +++ b/addons/resources_spreadsheet_view/typed_editors/dock_array.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=5 format=3 uid="uid://d10f70g3boclo"] +[gd_scene load_steps=5 format=3 uid="uid://c3a2cip8ffccv"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/typed_editors/dock_array.gd" id="1"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/editor_icon_button.gd" id="2"] -[sub_resource type="Image" id="Image_1ag68"] +[sub_resource type="Image" id="Image_ytggl"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 131, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 131, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 131, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 231, 255, 93, 93, 55, 255, 97, 97, 58, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 231, 255, 94, 94, 54, 255, 94, 94, 57, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 93, 93, 41, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 97, 97, 42, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 98, 98, 47, 255, 97, 97, 42, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 235, 255, 93, 93, 233, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 94, 94, 46, 255, 93, 93, 236, 255, 93, 93, 233, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0), "format": "RGBA8", @@ -13,7 +13,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_3oshq"] -image = SubResource("Image_1ag68") +image = SubResource("Image_ytggl") [node name="EditArray" type="VBoxContainer"] anchors_preset = 10 diff --git a/addons/resources_spreadsheet_view/typed_editors/dock_color.tscn b/addons/resources_spreadsheet_view/typed_editors/dock_color.tscn index dc17e2d..d7774e1 100644 --- a/addons/resources_spreadsheet_view/typed_editors/dock_color.tscn +++ b/addons/resources_spreadsheet_view/typed_editors/dock_color.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=2 format=3 uid="uid://cvx3xw8w77jba"] +[gd_scene load_steps=2 format=3 uid="uid://b3a3bo6cfyh5t"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/typed_editors/dock_color.gd" id="1"] diff --git a/addons/resources_spreadsheet_view/typed_editors/dock_dict.tscn b/addons/resources_spreadsheet_view/typed_editors/dock_dict.tscn index c00c5c1..66f54b8 100644 --- a/addons/resources_spreadsheet_view/typed_editors/dock_dict.tscn +++ b/addons/resources_spreadsheet_view/typed_editors/dock_dict.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=5 format=3 uid="uid://x5gffbaf8k2v"] +[gd_scene load_steps=5 format=3 uid="uid://p6x03dbvhnqw"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/typed_editors/dock_dict.gd" id="1_2yivi"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/editor_icon_button.gd" id="2_yck0k"] -[sub_resource type="Image" id="Image_xe4kw"] +[sub_resource type="Image" id="Image_tit0e"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 131, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 131, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 131, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 231, 255, 93, 93, 55, 255, 97, 97, 58, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 231, 255, 94, 94, 54, 255, 94, 94, 57, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 93, 93, 41, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 97, 97, 42, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 98, 98, 47, 255, 97, 97, 42, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 235, 255, 93, 93, 233, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 94, 94, 46, 255, 93, 93, 236, 255, 93, 93, 233, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0), "format": "RGBA8", @@ -13,7 +13,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_3oshq"] -image = SubResource("Image_xe4kw") +image = SubResource("Image_tit0e") [node name="EditArray" type="VBoxContainer"] anchors_preset = 10 diff --git a/addons/resources_spreadsheet_view/typed_editors/dock_enum_array.tscn b/addons/resources_spreadsheet_view/typed_editors/dock_enum_array.tscn index 8201901..c1540d5 100644 --- a/addons/resources_spreadsheet_view/typed_editors/dock_enum_array.tscn +++ b/addons/resources_spreadsheet_view/typed_editors/dock_enum_array.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=5 format=3 uid="uid://crfuon34lnst0"] +[gd_scene load_steps=5 format=3 uid="uid://ddqak780cwwfj"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/typed_editors/dock_enum_array.gd" id="1_n3flg"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/editor_icon_button.gd" id="2_mda1e"] -[sub_resource type="Image" id="Image_jk65c"] +[sub_resource type="Image" id="Image_5ktp6"] data = { "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 131, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 131, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 131, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 94, 94, 127, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 128, 128, 4, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 231, 255, 93, 93, 55, 255, 97, 97, 58, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 231, 255, 94, 94, 54, 255, 94, 94, 57, 255, 93, 93, 233, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 93, 93, 41, 255, 255, 255, 0, 255, 255, 255, 0, 255, 97, 97, 42, 255, 93, 93, 233, 255, 93, 93, 232, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 97, 97, 42, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 98, 98, 47, 255, 97, 97, 42, 255, 255, 255, 0, 255, 97, 97, 42, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 96, 96, 45, 255, 93, 93, 235, 255, 93, 93, 233, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 94, 94, 46, 255, 93, 93, 236, 255, 93, 93, 233, 255, 97, 97, 42, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 93, 93, 235, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 233, 255, 95, 95, 59, 255, 96, 96, 61, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 93, 93, 255, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 93, 93, 252, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0), "format": "RGBA8", @@ -13,7 +13,7 @@ data = { } [sub_resource type="ImageTexture" id="ImageTexture_3oshq"] -image = SubResource("Image_jk65c") +image = SubResource("Image_5ktp6") [node name="EditEnumArray" type="VBoxContainer"] anchors_preset = 10 diff --git a/addons/resources_spreadsheet_view/typed_editors/dock_number.gd b/addons/resources_spreadsheet_view/typed_editors/dock_number.gd index 8f1872e..d80bddb 100644 --- a/addons/resources_spreadsheet_view/typed_editors/dock_number.gd +++ b/addons/resources_spreadsheet_view/typed_editors/dock_number.gd @@ -138,18 +138,18 @@ func _on_SequenceFill_pressed(add : bool = false): func _fill_sequence(arr : Array, add : bool = false) -> Array: - if !_sequence_gen_inputs.get_child(0).text.is_valid_float(): + if !_sequence_gen_inputs.get_node("Start").text.is_valid_float(): return arr var start := float(_sequence_gen_inputs.get_child(0).text) var end = null var step = null - if _sequence_gen_inputs.get_child(2).text.is_valid_float(): - step = float(_sequence_gen_inputs.get_child(2).text) + if _sequence_gen_inputs.get_node("Step").text.is_valid_float(): + step = float(_sequence_gen_inputs.get_node("Step").text) - if _sequence_gen_inputs.get_child(1).text.is_valid_float(): - end = float(_sequence_gen_inputs.get_child(1).text) + if _sequence_gen_inputs.get_node("End").text.is_valid_float(): + end = float(_sequence_gen_inputs.get_node("End").text) if end == null: end = INF if step == null or step >= 0 else -INF diff --git a/addons/resources_spreadsheet_view/typed_editors/dock_number.tscn b/addons/resources_spreadsheet_view/typed_editors/dock_number.tscn index b1261cf..86eea13 100644 --- a/addons/resources_spreadsheet_view/typed_editors/dock_number.tscn +++ b/addons/resources_spreadsheet_view/typed_editors/dock_number.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=2 format=3 uid="uid://bafpct0bu5h5r"] +[gd_scene load_steps=2 format=3 uid="uid://gtbf7b0wptv"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/typed_editors/dock_number.gd" id="1"] @@ -75,17 +75,17 @@ visible = false layout_mode = 2 text = "Sequence" -[node name="LineEdit" type="LineEdit" parent="HBoxContainer/CustomX2/HBoxContainer"] +[node name="Start" type="LineEdit" parent="HBoxContainer/CustomX2/HBoxContainer"] layout_mode = 2 tooltip_text = "Start (must not be blank)" placeholder_text = "Start *" -[node name="LineEdit2" type="LineEdit" parent="HBoxContainer/CustomX2/HBoxContainer"] +[node name="End" type="LineEdit" parent="HBoxContainer/CustomX2/HBoxContainer"] layout_mode = 2 tooltip_text = "End" placeholder_text = "End" -[node name="LineEdit3" type="LineEdit" parent="HBoxContainer/CustomX2/HBoxContainer"] +[node name="Step" type="LineEdit" parent="HBoxContainer/CustomX2/HBoxContainer"] layout_mode = 2 tooltip_text = "End" placeholder_text = "Step" diff --git a/addons/resources_spreadsheet_view/typed_editors/dock_texture.tscn b/addons/resources_spreadsheet_view/typed_editors/dock_texture.tscn index c3f0251..fc2f411 100644 --- a/addons/resources_spreadsheet_view/typed_editors/dock_texture.tscn +++ b/addons/resources_spreadsheet_view/typed_editors/dock_texture.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=3 format=3 uid="uid://boraogt0aj5no"] +[gd_scene load_steps=3 format=3 uid="uid://rww3gpl052bn"] [ext_resource type="Script" path="res://addons/resources_spreadsheet_view/typed_editors/dock_texture.gd" id="1"] -[ext_resource type="Texture2D" uid="uid://c0jks8qogcdhp" path="res://icon.svg" id="2_xbp0j"] + +[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_h3mns"] [node name="EditTexture" type="VBoxContainer"] anchors_preset = -1 @@ -54,7 +55,7 @@ mouse_filter = 2 layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -texture = ExtResource("2_xbp0j") +texture = SubResource("PlaceholderTexture2D_h3mns") expand_mode = 1 stretch_mode = 5 diff --git a/config/attack/blunt_heavy_hit_blow.tres b/config/attack/blunt_heavy_hit_blow.tres index e474647..e9d2cb0 100644 --- a/config/attack/blunt_heavy_hit_blow.tres +++ b/config/attack/blunt_heavy_hit_blow.tres @@ -17,7 +17,3 @@ hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.4 is_force_pause = false -height = 2.0 -radius = 0.0 -size = Vector2(2, 1) -offset = Vector2(1, 0) diff --git a/config/attack/blunt_mid_hit_blow.tres b/config/attack/blunt_mid_hit_blow.tres index e309599..60b2f2d 100644 --- a/config/attack/blunt_mid_hit_blow.tres +++ b/config/attack/blunt_mid_hit_blow.tres @@ -17,7 +17,3 @@ hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.15 is_force_pause = false -height = 2.0 -radius = 0.0 -size = Vector2(2, 1) -offset = Vector2(1, 0) diff --git a/config/attack/blunt_normal_hit.tres b/config/attack/blunt_normal_hit.tres index ca72177..21fa92e 100644 --- a/config/attack/blunt_normal_hit.tres +++ b/config/attack/blunt_normal_hit.tres @@ -17,7 +17,3 @@ hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.05 is_force_pause = false -height = 2.0 -radius = 0.0 -size = Vector2(2, 1) -offset = Vector2(1, 0) diff --git a/config/attack/blunt_normal_hit_back.tres b/config/attack/blunt_normal_hit_back.tres index 64d1ca1..34f38e7 100644 --- a/config/attack/blunt_normal_hit_back.tres +++ b/config/attack/blunt_normal_hit_back.tres @@ -17,7 +17,3 @@ hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.05 is_force_pause = false -height = 2.0 -radius = 0.0 -size = Vector2(2, 1) -offset = Vector2(1, 0) diff --git a/config/attack/sharp_heavy_hit_blow.tres b/config/attack/sharp_heavy_hit_blow.tres index f23b440..3df4cf7 100644 --- a/config/attack/sharp_heavy_hit_blow.tres +++ b/config/attack/sharp_heavy_hit_blow.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://dbs2wjw20s0hu"] +[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://bv4uoey1liqoq"] [ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_j177j"] @@ -17,7 +17,3 @@ hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.3 is_force_pause = false -height = 2.0 -radius = 0.0 -size = Vector2(2, 1) -offset = Vector2(1, 0) diff --git a/config/attack/sharp_mid_hit.tres b/config/attack/sharp_mid_hit.tres index db19996..404d713 100644 --- a/config/attack/sharp_mid_hit.tres +++ b/config/attack/sharp_mid_hit.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://cae3dxpuqfcux"] +[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://qmivx7ntfrki"] [ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_ijso0"] @@ -17,7 +17,3 @@ hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.1 is_force_pause = false -height = 2.0 -radius = 0.0 -size = Vector2(2, 1) -offset = Vector2(1, 0) diff --git a/config/attack/sharp_mid_hit_down.tres b/config/attack/sharp_mid_hit_down.tres index 1da4c00..de580ba 100644 --- a/config/attack/sharp_mid_hit_down.tres +++ b/config/attack/sharp_mid_hit_down.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://rqjggte0qh84"] +[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://dj7tchh0202t2"] [ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_l5a6t"] @@ -17,7 +17,3 @@ hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.1 is_force_pause = false -height = 2.0 -radius = 0.0 -size = Vector2(2, 1) -offset = Vector2(1, 0) diff --git a/config/attack/sharp_normal_hit.tres b/config/attack/sharp_normal_hit.tres index 85dd650..143404e 100644 --- a/config/attack/sharp_normal_hit.tres +++ b/config/attack/sharp_normal_hit.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://bsqk3q6mccllg"] +[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://d3mcp8sf6qbmd"] [ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_v2kmn"] @@ -17,7 +17,3 @@ hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.02 is_force_pause = false -height = 2.0 -radius = 0.0 -size = Vector2(2, 1) -offset = Vector2(1, 0) diff --git a/config/attack/sharp_normal_hit_back.tres b/config/attack/sharp_normal_hit_back.tres index 9faca7c..a86f0e3 100644 --- a/config/attack/sharp_normal_hit_back.tres +++ b/config/attack/sharp_normal_hit_back.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://ckeuv5lhfk2s0"] +[gd_resource type="Resource" script_class="AttackCfg" load_steps=2 format=3 uid="uid://btg40rn2f36c2"] [ext_resource type="Script" path="res://script/config/attack_cfg.gd" id="1_4245c"] @@ -17,7 +17,3 @@ hit_back_duration = 0.05 hit_up_duration = 0.05 pause_time = 0.02 is_force_pause = false -height = 2.0 -radius = 0.0 -size = Vector2(2, 1) -offset = Vector2(1, 0) diff --git a/config/attack/sharp_normal_hit_up.tres b/config/attack/sharp_normal_hit_up.tres index 0936e7d..6b64f65 100644 --- a/config/attack/sharp_normal_hit_up.tres +++ b/config/attack/sharp_normal_hit_up.tres @@ -7,16 +7,13 @@ script = ExtResource("1_iuifx") damage_rate = 1.0 break_level = 1 stun_attack = 10.0 +damage_type = 0 +is_floating = true +is_hit_down = false +is_rebound = false hit_back_speed = 0.0 -hit_back_duration = 0.0 hit_up_speed = 3.0 +hit_back_duration = 0.0 hit_up_duration = 0.1 pause_time = 0.1 -is_floating = true -is_hit_down = false -is_rebound = false is_force_pause = true -height = 2.0 -radius = 0.0 -size = Vector2(2, 1) -offset = Vector2(1, 0) diff --git a/config/attack_box/box_normal.tres b/config/attack_box/box_normal.tres new file mode 100644 index 0000000..41dbd7a --- /dev/null +++ b/config/attack_box/box_normal.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" script_class="AttackBoxCfg" load_steps=2 format=3 uid="uid://bqejjllfy03h3"] + +[ext_resource type="Script" path="res://script/config/attack_box_cfg.gd" id="1_d4mqn"] + +[resource] +script = ExtResource("1_d4mqn") +height = 1.0 +radius = 0.0 +size = Vector2(1, 1) +offset = Vector2(0.5, 0) diff --git a/config/attack_box/circle_normal.tres b/config/attack_box/circle_normal.tres new file mode 100644 index 0000000..17d8557 --- /dev/null +++ b/config/attack_box/circle_normal.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" script_class="AttackBoxCfg" load_steps=2 format=3 uid="uid://57sukcw6ewqo"] + +[ext_resource type="Script" path="res://script/config/attack_box_cfg.gd" id="1_8rhve"] + +[resource] +script = ExtResource("1_8rhve") +height = 1.0 +radius = 0.5 +size = Vector2(0, 0) +offset = Vector2(0, 0) diff --git a/config/skill_player_weapon/hero01_fist_air_skill01.tres b/config/skill_player_weapon/hero01_fist_air_skill01.tres index 381943c..9d62eeb 100644 --- a/config/skill_player_weapon/hero01_fist_air_skill01.tres +++ b/config/skill_player_weapon/hero01_fist_air_skill01.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://dkxgra6y2u30l"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_h0ykq"] +[ext_resource type="Resource" uid="uid://dib6g7t6p5ac2" path="res://config/attack/blunt_normal_hit.tres" id="1_nott2"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_mje6b"] [ext_resource type="Animation" uid="uid://dxgqn5fa7aokj" path="res://resource/skill_animation/hero01_fist_air_skill01.tres" id="3_q461t"] [ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="4_seudu"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_heavy" name = "" skill_animation = ExtResource("3_q461t") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_h0ykq")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_nott2") refresh_animation = false sprite_frames = ExtResource("4_seudu") animation_name = "fist_air_skill01" diff --git a/config/skill_player_weapon/hero01_fist_attack01.tres b/config/skill_player_weapon/hero01_fist_attack01.tres index 38846d5..0e7937c 100644 --- a/config/skill_player_weapon/hero01_fist_attack01.tres +++ b/config/skill_player_weapon/hero01_fist_attack01.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://7e4fnj5sg72s"] -[ext_resource type="Resource" uid="uid://dib6g7t6p5ac2" path="res://config/attack/blunt_normal_hit.tres" id="1_cl2eu"] +[ext_resource type="Resource" uid="uid://dib6g7t6p5ac2" path="res://config/attack/blunt_normal_hit.tres" id="1_k0cmy"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_yc8jq"] [ext_resource type="Animation" uid="uid://t01a4jvp8srr" path="res://resource/skill_animation/hero01_fist_attack01.tres" id="3_b2pdb"] [ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="4_ymqrn"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("3_b2pdb") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_cl2eu")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_k0cmy") refresh_animation = false sprite_frames = ExtResource("4_ymqrn") animation_name = "fist_attack01" diff --git a/config/skill_player_weapon/hero01_fist_attack02.tres b/config/skill_player_weapon/hero01_fist_attack02.tres index d45f3ba..b228aa0 100644 --- a/config/skill_player_weapon/hero01_fist_attack02.tres +++ b/config/skill_player_weapon/hero01_fist_attack02.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://dubkvm86cj32f"] -[ext_resource type="Resource" uid="uid://c87w2x5qfqdns" path="res://config/attack/blunt_normal_hit_back.tres" id="1_ne108"] +[ext_resource type="Resource" uid="uid://c87w2x5qfqdns" path="res://config/attack/blunt_normal_hit_back.tres" id="1_ixy7x"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_h70wx"] [ext_resource type="Animation" uid="uid://cyu0yin1rpiak" path="res://resource/skill_animation/hero01_fist_attack02.tres" id="3_tllt1"] [ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="4_fevaa"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("3_tllt1") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_ne108")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_ixy7x") refresh_animation = false sprite_frames = ExtResource("4_fevaa") animation_name = "fist_attack02" diff --git a/config/skill_player_weapon/hero01_fist_attack03.tres b/config/skill_player_weapon/hero01_fist_attack03.tres index 4f94ea0..d9cc3a0 100644 --- a/config/skill_player_weapon/hero01_fist_attack03.tres +++ b/config/skill_player_weapon/hero01_fist_attack03.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://dekpkk8o6o8hk"] -[ext_resource type="Resource" uid="uid://duu05cr8gk5v4" path="res://config/attack/blunt_mid_hit_blow.tres" id="1_vxltf"] +[ext_resource type="Resource" uid="uid://duu05cr8gk5v4" path="res://config/attack/blunt_mid_hit_blow.tres" id="1_am4eq"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_fde7v"] [ext_resource type="Animation" uid="uid://c6mk8tfdpniys" path="res://resource/skill_animation/hero01_fist_attack03.tres" id="3_6rajt"] [ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="4_orcy6"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("3_6rajt") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_vxltf")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_am4eq") refresh_animation = false sprite_frames = ExtResource("4_orcy6") animation_name = "fist_attack03" diff --git a/config/skill_player_weapon/hero01_fist_attack04.tres b/config/skill_player_weapon/hero01_fist_attack04.tres index b0fdaeb..e6da5fd 100644 --- a/config/skill_player_weapon/hero01_fist_attack04.tres +++ b/config/skill_player_weapon/hero01_fist_attack04.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://b4aysymwqtvtd"] -[ext_resource type="Resource" uid="uid://duu05cr8gk5v4" path="res://config/attack/blunt_mid_hit_blow.tres" id="1_i4hus"] +[ext_resource type="Resource" uid="uid://duu05cr8gk5v4" path="res://config/attack/blunt_mid_hit_blow.tres" id="1_s12sc"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_mhuew"] [ext_resource type="Animation" uid="uid://6u3dhxly760l" path="res://resource/skill_animation/hero01_fist_attack04.tres" id="3_bst70"] [ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="4_hyek5"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("3_bst70") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_i4hus")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_s12sc") refresh_animation = false sprite_frames = ExtResource("4_hyek5") animation_name = "fist_attack04" diff --git a/config/skill_player_weapon/hero01_fist_attack05.tres b/config/skill_player_weapon/hero01_fist_attack05.tres index 374001d..8fdcb20 100644 --- a/config/skill_player_weapon/hero01_fist_attack05.tres +++ b/config/skill_player_weapon/hero01_fist_attack05.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://0n2jnkdrwa2l"] -[ext_resource type="Resource" uid="uid://bwe8xlgfhx1gl" path="res://config/attack/blunt_heavy_hit_blow.tres" id="1_k5vfx"] +[ext_resource type="Resource" uid="uid://bwe8xlgfhx1gl" path="res://config/attack/blunt_heavy_hit_blow.tres" id="1_5lwhl"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_ym7q1"] [ext_resource type="Animation" uid="uid://b2xdmgnem1h4g" path="res://resource/skill_animation/hero01_fist_attack05.tres" id="3_dbjmb"] [ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="4_mhr07"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("3_dbjmb") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_k5vfx")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_5lwhl") refresh_animation = false sprite_frames = ExtResource("4_mhr07") animation_name = "fist_attack05" diff --git a/config/skill_player_weapon/hero01_long_air_attack01.tres b/config/skill_player_weapon/hero01_long_air_attack01.tres index 8d1e1f3..bf294d4 100644 --- a/config/skill_player_weapon/hero01_long_air_attack01.tres +++ b/config/skill_player_weapon/hero01_long_air_attack01.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://bsdspblvefgpv"] +[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://rib7hj11oscr"] [ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_mxlqc"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_hh5ph"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("3_3pp8a") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_mxlqc")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_mxlqc") refresh_animation = false sprite_frames = ExtResource("4_q0bln") animation_name = "long_air_attack01" diff --git a/config/skill_player_weapon/hero01_long_air_attack02.tres b/config/skill_player_weapon/hero01_long_air_attack02.tres index ed785a6..a220647 100644 --- a/config/skill_player_weapon/hero01_long_air_attack02.tres +++ b/config/skill_player_weapon/hero01_long_air_attack02.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://drxg06dvcx4oj"] +[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://c675lckg7ly25"] [ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_qfkyy"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_gjjhv"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("3_76yga") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_qfkyy")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_qfkyy") refresh_animation = false sprite_frames = ExtResource("4_ahm2t") animation_name = "long_air_attack02" diff --git a/config/skill_player_weapon/hero01_long_air_attack03.tres b/config/skill_player_weapon/hero01_long_air_attack03.tres index 9abab2b..07fc6d2 100644 --- a/config/skill_player_weapon/hero01_long_air_attack03.tres +++ b/config/skill_player_weapon/hero01_long_air_attack03.tres @@ -1,6 +1,6 @@ -[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://c8l7h74abqlhb"] +[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://b705py5rht5i3"] -[ext_resource type="Resource" uid="uid://rqjggte0qh84" path="res://config/attack/sharp_mid_hit_down.tres" id="1_gddcp"] +[ext_resource type="Resource" uid="uid://dj7tchh0202t2" path="res://config/attack/sharp_mid_hit_down.tres" id="1_rccpt"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_0x7hh"] [ext_resource type="Animation" uid="uid://bh5s2t3cbobpp" path="res://resource/skill_animation/hero01_long_air_attack03.tres" id="3_1erk8"] [ext_resource type="SpriteFrames" uid="uid://ce83cuqwgwwi4" path="res://resource/animation/character/hero01_long_attack.aseprite" id="4_wrd60"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("3_1erk8") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_gddcp")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_rccpt") refresh_animation = false sprite_frames = ExtResource("4_wrd60") animation_name = "long_air_attack03" diff --git a/config/skill_player_weapon/hero01_long_attack01.tres b/config/skill_player_weapon/hero01_long_attack01.tres index de724d0..81eb2a3 100644 --- a/config/skill_player_weapon/hero01_long_attack01.tres +++ b/config/skill_player_weapon/hero01_long_attack01.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://b6x3jdiqtum6"] +[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://dkr1k00c2eecc"] [ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_6ven2"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="1_gik08"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("2_6nbpq") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_6ven2")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_6ven2") refresh_animation = false sprite_frames = ExtResource("5_xel5p") animation_name = "long_attack01" diff --git a/config/skill_player_weapon/hero01_long_attack02.tres b/config/skill_player_weapon/hero01_long_attack02.tres index 58e9e1d..c1e357e 100644 --- a/config/skill_player_weapon/hero01_long_attack02.tres +++ b/config/skill_player_weapon/hero01_long_attack02.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://cs32884hwqxd7"] +[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://kpr8aqmnyv2k"] [ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_8fm1u"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="1_e0fqi"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("2_jrgan") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_8fm1u")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_8fm1u") refresh_animation = false sprite_frames = ExtResource("3_jidy7") animation_name = "long_attack02" diff --git a/config/skill_player_weapon/hero01_long_attack03.tres b/config/skill_player_weapon/hero01_long_attack03.tres index 36ab501..a5363fc 100644 --- a/config/skill_player_weapon/hero01_long_attack03.tres +++ b/config/skill_player_weapon/hero01_long_attack03.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://huxlxrmyulo"] +[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://qele60lk54e1"] [ext_resource type="Resource" uid="uid://ckeuv5lhfk2s0" path="res://config/attack/sharp_normal_hit_back.tres" id="1_7ai5j"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="1_uaib7"] @@ -15,9 +15,9 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("2_ugt3f") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_7ai5j")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_7ai5j") +attack2 = ExtResource("1_7ai5j") refresh_animation = false sprite_frames = ExtResource("3_sr2og") animation_name = "long_attack03" diff --git a/config/skill_player_weapon/hero01_long_attack04.tres b/config/skill_player_weapon/hero01_long_attack04.tres index 6aac951..06645b2 100644 --- a/config/skill_player_weapon/hero01_long_attack04.tres +++ b/config/skill_player_weapon/hero01_long_attack04.tres @@ -1,7 +1,7 @@ -[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=7 format=3 uid="uid://chuv8k5d44ln4"] +[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=7 format=3 uid="uid://dvdr5vd1vbe12"] -[ext_resource type="Resource" uid="uid://dbs2wjw20s0hu" path="res://config/attack/sharp_heavy_hit_blow.tres" id="1_7tise"] -[ext_resource type="Resource" uid="uid://c87w2x5qfqdns" path="res://config/attack/blunt_normal_hit_back.tres" id="1_rvymn"] +[ext_resource type="Resource" uid="uid://bv4uoey1liqoq" path="res://config/attack/sharp_heavy_hit_blow.tres" id="1_8ipjq"] +[ext_resource type="Resource" uid="uid://c87w2x5qfqdns" path="res://config/attack/blunt_normal_hit_back.tres" id="1_44ai1"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="1_xsxbs"] [ext_resource type="Animation" uid="uid://dk1o3gqhjmuvh" path="res://resource/skill_animation/hero01_long_attack04.tres" id="2_sam6s"] [ext_resource type="SpriteFrames" uid="uid://ce83cuqwgwwi4" path="res://resource/animation/character/hero01_long_attack.aseprite" id="3_w7h1m"] @@ -16,9 +16,9 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("2_sam6s") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_rvymn"), ExtResource("1_7tise")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_44ai1") +attack2 = ExtResource("1_8ipjq") refresh_animation = false sprite_frames = ExtResource("3_w7h1m") animation_name = "long_attack04" diff --git a/config/skill_player_weapon/hero01_long_skill01.tres b/config/skill_player_weapon/hero01_long_skill01.tres index 198cc69..de33bf9 100644 --- a/config/skill_player_weapon/hero01_long_skill01.tres +++ b/config/skill_player_weapon/hero01_long_skill01.tres @@ -1,6 +1,6 @@ -[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://bi2ipbximefsr"] +[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://cwqbhrv8bd5vn"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_p5wrw"] +[ext_resource type="Resource" uid="uid://cae3dxpuqfcux" path="res://config/attack/sharp_mid_hit.tres" id="1_7yroh"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="1_ud5ph"] [ext_resource type="Animation" uid="uid://bjnkrte7660pt" path="res://resource/skill_animation/hero01_long_skill01.tres" id="2_ewts2"] [ext_resource type="SpriteFrames" uid="uid://dhfqj1dxldqao" path="res://resource/animation/character/hero01_long_skill01.aseprite" id="3_qwjfl"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_heavy" name = "" skill_animation = ExtResource("2_ewts2") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_p5wrw")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_7yroh") refresh_animation = false sprite_frames = ExtResource("3_qwjfl") animation_name = "long_skill01" diff --git a/config/skill_player_weapon/hero01_long_skill02.tres b/config/skill_player_weapon/hero01_long_skill02.tres index 8bf3387..9eb0a0d 100644 --- a/config/skill_player_weapon/hero01_long_skill02.tres +++ b/config/skill_player_weapon/hero01_long_skill02.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://4whbnu8f7qyo"] +[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://vvftj1wk88xj"] [ext_resource type="Resource" uid="uid://ckbf40c75bfqf" path="res://config/attack/sharp_normal_hit_up.tres" id="1_edtv7"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="2_1xtt1"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_heavy" name = "" skill_animation = ExtResource("3_b7s0y") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_edtv7")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_edtv7") refresh_animation = false sprite_frames = ExtResource("4_rbnly") animation_name = "long_skill02" diff --git a/config/skill_player_weapon/hero01_short_attack01.tres b/config/skill_player_weapon/hero01_short_attack01.tres index aeb58bf..f8c6679 100644 --- a/config/skill_player_weapon/hero01_short_attack01.tres +++ b/config/skill_player_weapon/hero01_short_attack01.tres @@ -1,6 +1,6 @@ -[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://bcxglqq08pymr"] +[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://ddc14ei2mwen6"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_r3o2x"] +[ext_resource type="Resource" uid="uid://dib6g7t6p5ac2" path="res://config/attack/blunt_normal_hit.tres" id="1_4lnv2"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="3_gsnqk"] [ext_resource type="Animation" uid="uid://bkre61dn64j2f" path="res://resource/skill_animation/hero01_short_attack01.tres" id="4_f30l7"] [ext_resource type="SpriteFrames" uid="uid://cndpnxtdh37ii" path="res://resource/animation/character/hero01_short_attack.aseprite" id="5_8vcrr"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("4_f30l7") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_r3o2x")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_4lnv2") refresh_animation = false sprite_frames = ExtResource("5_8vcrr") animation_name = "short_attack01" diff --git a/config/skill_player_weapon/hero01_short_attack02.tres b/config/skill_player_weapon/hero01_short_attack02.tres index 0e60102..d0b1952 100644 --- a/config/skill_player_weapon/hero01_short_attack02.tres +++ b/config/skill_player_weapon/hero01_short_attack02.tres @@ -1,6 +1,6 @@ -[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://cm7nbxogmlvp5"] +[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://d2pyl8sqnljtw"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_nmank"] +[ext_resource type="Resource" uid="uid://dib6g7t6p5ac2" path="res://config/attack/blunt_normal_hit.tres" id="1_hnewa"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="3_8ixmd"] [ext_resource type="Animation" uid="uid://xfuwfwtw4cna" path="res://resource/skill_animation/hero01_short_attack02.tres" id="4_mepfm"] [ext_resource type="SpriteFrames" uid="uid://cndpnxtdh37ii" path="res://resource/animation/character/hero01_short_attack.aseprite" id="5_dxfya"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("4_mepfm") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_nmank")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_hnewa") refresh_animation = false sprite_frames = ExtResource("5_dxfya") animation_name = "short_attack02" diff --git a/config/skill_player_weapon/hero01_short_attack03.tres b/config/skill_player_weapon/hero01_short_attack03.tres index ba1cc61..1ed300b 100644 --- a/config/skill_player_weapon/hero01_short_attack03.tres +++ b/config/skill_player_weapon/hero01_short_attack03.tres @@ -1,6 +1,6 @@ -[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://bex4a43t6ettj"] +[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://dxj5ekoi7cd7m"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_5om0v"] +[ext_resource type="Resource" uid="uid://c87w2x5qfqdns" path="res://config/attack/blunt_normal_hit_back.tres" id="1_afi2j"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="3_8rsme"] [ext_resource type="Animation" uid="uid://bdyjvq185tdk6" path="res://resource/skill_animation/hero01_short_attack03.tres" id="4_7ws6s"] [ext_resource type="SpriteFrames" uid="uid://cndpnxtdh37ii" path="res://resource/animation/character/hero01_short_attack.aseprite" id="5_40215"] @@ -15,9 +15,9 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("4_7ws6s") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_5om0v")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_afi2j") +attack2 = ExtResource("1_afi2j") refresh_animation = false sprite_frames = ExtResource("5_40215") animation_name = "short_attack03" diff --git a/config/skill_player_weapon/hero01_short_attack04.tres b/config/skill_player_weapon/hero01_short_attack04.tres index e0e7255..39fa6dd 100644 --- a/config/skill_player_weapon/hero01_short_attack04.tres +++ b/config/skill_player_weapon/hero01_short_attack04.tres @@ -1,6 +1,6 @@ -[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://cya7i41k08jgc"] +[gd_resource type="Resource" script_class="SkillPlayerCfg" load_steps=6 format=3 uid="uid://bh0tfn8mi3u3r"] -[ext_resource type="Resource" uid="uid://bsqk3q6mccllg" path="res://config/attack/sharp_normal_hit.tres" id="1_hd2st"] +[ext_resource type="Resource" uid="uid://dbs2wjw20s0hu" path="res://config/attack/sharp_heavy_hit_blow.tres" id="1_d23lh"] [ext_resource type="Script" path="res://script/config/player_skill_cfg.gd" id="3_44lu2"] [ext_resource type="Animation" uid="uid://c8qll8wcn633m" path="res://resource/skill_animation/hero01_short_attack04.tres" id="4_rcj2c"] [ext_resource type="SpriteFrames" uid="uid://cndpnxtdh37ii" path="res://resource/animation/character/hero01_short_attack.aseprite" id="5_owk7o"] @@ -15,9 +15,8 @@ break_level = 3 action = "attack_light" name = "" skill_animation = ExtResource("4_rcj2c") -attack_list = Array[Resource("res://script/config/attack_cfg.gd")]([ExtResource("1_hd2st")]) -sub_character_list = Array[Resource("res://script/config/character_cfg.gd")]([]) free_lock = false +attack1 = ExtResource("1_d23lh") refresh_animation = false sprite_frames = ExtResource("5_owk7o") animation_name = "short_attack04" diff --git a/example/Items/item_icons/items.png b/example/Items/item_icons/items.png new file mode 100644 index 0000000..d2a6f64 Binary files /dev/null and b/example/Items/item_icons/items.png differ diff --git a/example/Items/item_icons/items.png.import b/example/Items/item_icons/items.png.import new file mode 100644 index 0000000..d94184a --- /dev/null +++ b/example/Items/item_icons/items.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dwi4ioxeauoc4" +path="res://.godot/imported/items.png-d10b6b2feac7b3334582afee422be338.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://example/Items/item_icons/items.png" +dest_files=["res://.godot/imported/items.png-d10b6b2feac7b3334582afee422be338.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/example/Items/item_type.gd b/example/Items/item_type.gd new file mode 100644 index 0000000..c436d63 --- /dev/null +++ b/example/Items/item_type.gd @@ -0,0 +1,32 @@ +extends Resource + +enum SlotType { + SMALL, + LARGE, + EQUIPMENT, + QUEST, + POTION, + AMMO, + CURRENCY, + FUEL, + CRAFTING, + E_MAINHAND, + E_OFFHAND, + E_HELM, + E_CHEST, + E_BELT, + E_HANDS, + E_FEET, + E_RING, + E_NECK, +} +@export var name := "" +@export_multiline var description := "" +@export var max_stack_count := 1 +@export var in_inventory_width := 1 +@export var in_inventory_height := 1 +@export var texture : Texture +@export var mesh : Mesh + +@export var slot_flags : SlotType = SlotType.SMALL +@export var default_properties : Dictionary diff --git a/example/Items/items/arrows.tres b/example/Items/items/arrows.tres new file mode 100644 index 0000000..b5558a3 --- /dev/null +++ b/example/Items/items/arrows.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://c65l1w3756rlu"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_npnns"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_npnns") +region = Rect2(12, 24, 24, 12) + +[resource] +script = ExtResource("2") +name = "arrows" +description = "desc_arrows" +max_stack_count = 20 +in_inventory_width = 2 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 5 +default_properties = {} diff --git a/example/Items/items/belt_1.tres b/example/Items/items/belt_1.tres new file mode 100644 index 0000000..f797bab --- /dev/null +++ b/example/Items/items/belt_1.tres @@ -0,0 +1,28 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://d2gb438d6vtlg"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="1"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_4rd1p"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_4rd1p") +region = Rect2(0, 156, 24, 12) + +[resource] +script = ExtResource("1") +name = "belt_1" +description = "desc_belt_1" +max_stack_count = 1 +in_inventory_width = 2 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 13 +default_properties = { +"back_color": Color(1, 0.65098, 0, 1), +"price": { +"res://example/wyvernbox/item_types/consumable/coin_gold.tres": 50, +"res://example/wyvernbox/item_types/consumable/coin_purple.tres": 10 +}, +"stats": { +"dodgerate": 12.0 +} +} diff --git a/example/Items/items/belt_2.tres b/example/Items/items/belt_2.tres new file mode 100644 index 0000000..631da08 --- /dev/null +++ b/example/Items/items/belt_2.tres @@ -0,0 +1,28 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://c158a1idjr28m"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="1"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_laq2t"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_laq2t") +region = Rect2(24, 156, 24, 12) + +[resource] +script = ExtResource("1") +name = "belt_2" +description = "desc_belt_2" +max_stack_count = 1 +in_inventory_width = 2 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 13 +default_properties = { +"back_color": Color(1, 0.65098, 0, 1), +"price": { +"res://example/wyvernbox/item_types/consumable/coin_gold.tres": 50, +"res://example/wyvernbox/item_types/consumable/coin_purple.tres": 10 +}, +"stats": { +"health_regen": 2.0 +} +} diff --git a/example/Items/items/chestplate_1.tres b/example/Items/items/chestplate_1.tres new file mode 100644 index 0000000..c3c6495 --- /dev/null +++ b/example/Items/items/chestplate_1.tres @@ -0,0 +1,28 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://ubapirchpsp"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="1"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_cwgb2"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_cwgb2") +region = Rect2(0, 120, 24, 36) + +[resource] +script = ExtResource("1") +name = "chestplate_1" +description = "desc_chestplate_1" +max_stack_count = 1 +in_inventory_width = 2 +in_inventory_height = 3 +texture = SubResource("1") +slot_flags = 12 +default_properties = { +"back_color": Color(1, 0.65098, 0, 1), +"price": { +"res://example/wyvernbox/item_types/consumable/coin_gold.tres": 50, +"res://example/wyvernbox/item_types/consumable/coin_purple.tres": 10 +}, +"stats": { +"defense": 24.0 +} +} diff --git a/example/Items/items/chestplate_2.tres b/example/Items/items/chestplate_2.tres new file mode 100644 index 0000000..516b0ab --- /dev/null +++ b/example/Items/items/chestplate_2.tres @@ -0,0 +1,29 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://nquj8y70tdy1"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="1"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_fdlcg"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_fdlcg") +region = Rect2(24, 120, 24, 36) + +[resource] +script = ExtResource("1") +name = "chestplate_2" +description = "desc_chestplate_2" +max_stack_count = 1 +in_inventory_width = 2 +in_inventory_height = 3 +texture = SubResource("1") +slot_flags = 12 +default_properties = { +"back_color": Color(1, 0.65098, 0, 1), +"price": { +"res://example/wyvernbox/item_types/consumable/coin_gold.tres": 50, +"res://example/wyvernbox/item_types/consumable/coin_purple.tres": 10 +}, +"stats": { +"defense": 16.0, +"dodgerate": 16.0 +} +} diff --git a/example/Items/items/coin_gold.tres b/example/Items/items/coin_gold.tres new file mode 100644 index 0000000..b4d0ff8 --- /dev/null +++ b/example/Items/items/coin_gold.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://cqbrojgnmjvil"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_lbcs7"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_lbcs7") +region = Rect2(0, 0, 12, 12) + +[resource] +script = ExtResource("2") +name = "coin_gold" +description = "desc_coin_gold" +max_stack_count = 100 +in_inventory_width = 1 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 6 +default_properties = {} diff --git a/example/Items/items/coin_purple.tres b/example/Items/items/coin_purple.tres new file mode 100644 index 0000000..624c204 --- /dev/null +++ b/example/Items/items/coin_purple.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://4amkkv73m0lc"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_gphlp"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_gphlp") +region = Rect2(0, 12, 12, 12) + +[resource] +script = ExtResource("2") +name = "coin_purple" +description = "desc_coin_purple" +max_stack_count = 100 +in_inventory_width = 1 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 6 +default_properties = { +"back_color": Color(0.67451, 0.270588, 0.972549, 1) +} diff --git a/example/Items/items/feather.tres b/example/Items/items/feather.tres new file mode 100644 index 0000000..29cd487 --- /dev/null +++ b/example/Items/items/feather.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://csj85mouew67r"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_vvaq3"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_vvaq3") +region = Rect2(84, 24, 12, 12) + +[resource] +script = ExtResource("2") +name = "feather" +description = "desc_feather" +max_stack_count = 20 +in_inventory_width = 1 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 8 +default_properties = {} diff --git a/example/Items/items/gem_blue.tres b/example/Items/items/gem_blue.tres new file mode 100644 index 0000000..77e330d --- /dev/null +++ b/example/Items/items/gem_blue.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://ghiwkmadh0i"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_io53q"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_io53q") +region = Rect2(84, 36, 12, 12) + +[resource] +script = ExtResource("2") +name = "gem_blue" +description = "desc_gem_blue" +max_stack_count = 20 +in_inventory_width = 1 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 8 +default_properties = {} diff --git a/example/Items/items/head_helmet.tres b/example/Items/items/head_helmet.tres new file mode 100644 index 0000000..5e2e470 --- /dev/null +++ b/example/Items/items/head_helmet.tres @@ -0,0 +1,28 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://dmgt12il41ul7"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="1"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_1ooxf"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_1ooxf") +region = Rect2(0, 168, 24, 24) + +[resource] +script = ExtResource("1") +name = "head_helmet" +description = "desc_head_helmet" +max_stack_count = 1 +in_inventory_width = 2 +in_inventory_height = 2 +texture = SubResource("1") +slot_flags = 11 +default_properties = { +"back_color": Color(1, 0.65098, 0, 1), +"price": { +"res://example/wyvernbox/item_types/consumable/coin_gold.tres": 50, +"res://example/wyvernbox/item_types/consumable/coin_purple.tres": 10 +}, +"stats": { +"defense": 8.0 +} +} diff --git a/example/Items/items/head_wizardhat.tres b/example/Items/items/head_wizardhat.tres new file mode 100644 index 0000000..b691150 --- /dev/null +++ b/example/Items/items/head_wizardhat.tres @@ -0,0 +1,28 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://bwtgji4rkgc5"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="1"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_6ygl4"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_6ygl4") +region = Rect2(24, 168, 24, 24) + +[resource] +script = ExtResource("1") +name = "head_wizardhat" +description = "desc_head_wizardhat" +max_stack_count = 1 +in_inventory_width = 2 +in_inventory_height = 2 +texture = SubResource("1") +slot_flags = 11 +default_properties = { +"back_color": Color(1, 0.65098, 0, 1), +"price": { +"res://example/wyvernbox/item_types/consumable/coin_gold.tres": 50, +"res://example/wyvernbox/item_types/consumable/coin_purple.tres": 10 +}, +"stats": { +"magic_regen": 2.0 +} +} diff --git a/example/Items/items/herb.tres b/example/Items/items/herb.tres new file mode 100644 index 0000000..c042731 --- /dev/null +++ b/example/Items/items/herb.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://v7imonnsq6xx"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_awqqy"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_awqqy") +region = Rect2(12, 36, 24, 12) + +[resource] +script = ExtResource("2") +name = "herb" +description = "desc_herb" +max_stack_count = 20 +in_inventory_width = 2 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 8 +default_properties = {} diff --git a/example/Items/items/leather.tres b/example/Items/items/leather.tres new file mode 100644 index 0000000..c202731 --- /dev/null +++ b/example/Items/items/leather.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://okiwvbkwltf2"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_v5nv2"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_v5nv2") +region = Rect2(60, 24, 24, 12) + +[resource] +script = ExtResource("2") +name = "leather" +description = "desc_leather" +max_stack_count = 20 +in_inventory_width = 2 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 8 +default_properties = {} diff --git a/example/Items/items/magic_crystal.tres b/example/Items/items/magic_crystal.tres new file mode 100644 index 0000000..d06faa7 --- /dev/null +++ b/example/Items/items/magic_crystal.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://d4eo3up2esgao"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_l77qe"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_l77qe") +region = Rect2(0, 24, 12, 24) + +[resource] +script = ExtResource("2") +name = "magic_crystal" +description = "desc_magic_crystal" +max_stack_count = 20 +in_inventory_width = 1 +in_inventory_height = 2 +texture = SubResource("1") +slot_flags = 8 +default_properties = { +"back_color": Color(0.67451, 0.270588, 0.972549, 1) +} diff --git a/example/Items/items/melee_battleaxe.tres b/example/Items/items/melee_battleaxe.tres new file mode 100644 index 0000000..9a1f21b --- /dev/null +++ b/example/Items/items/melee_battleaxe.tres @@ -0,0 +1,29 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://vi43b1o26w60"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_glg1x"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_glg1x") +region = Rect2(12, 72, 12, 48) + +[resource] +script = ExtResource("2") +name = "melee_battleaxe" +description = "desc_melee_battleaxe" +max_stack_count = 1 +in_inventory_width = 1 +in_inventory_height = 4 +texture = SubResource("1") +slot_flags = 9 +default_properties = { +"back_color": Color(1, 0.65098, 0, 1), +"price": { +"res://example/wyvernbox/item_types/consumable/coin_gold.tres": 50, +"res://example/wyvernbox/item_types/consumable/coin_purple.tres": 10 +}, +"stats": { +"weapon_damage": 8.0, +"weapon_speed": 0.8 +} +} diff --git a/example/Items/items/melee_sword.tres b/example/Items/items/melee_sword.tres new file mode 100644 index 0000000..f10f91d --- /dev/null +++ b/example/Items/items/melee_sword.tres @@ -0,0 +1,29 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://cidvqmpxobgv7"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_qyy4c"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_qyy4c") +region = Rect2(0, 72, 12, 36) + +[resource] +script = ExtResource("2") +name = "melee_sword" +description = "desc_melee_sword" +max_stack_count = 1 +in_inventory_width = 1 +in_inventory_height = 3 +texture = SubResource("1") +slot_flags = 9 +default_properties = { +"back_color": Color(1, 0.65098, 0, 1), +"price": { +"res://example/wyvernbox/item_types/consumable/coin_gold.tres": 50, +"res://example/wyvernbox/item_types/consumable/coin_purple.tres": 10 +}, +"stats": { +"weapon_damage": 4.0, +"weapon_speed": 1.5 +} +} diff --git a/example/Items/items/metalscrap_copper.tres b/example/Items/items/metalscrap_copper.tres new file mode 100644 index 0000000..c267926 --- /dev/null +++ b/example/Items/items/metalscrap_copper.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://d2vm3srqwars"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_w6v7m"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_w6v7m") +region = Rect2(48, 24, 12, 12) + +[resource] +script = ExtResource("2") +name = "metalscrap_copper" +description = "desc_metalscrap_copper" +max_stack_count = 20 +in_inventory_width = 1 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 8 +default_properties = {} diff --git a/example/Items/items/metalscrap_gold.tres b/example/Items/items/metalscrap_gold.tres new file mode 100644 index 0000000..b20a5ac --- /dev/null +++ b/example/Items/items/metalscrap_gold.tres @@ -0,0 +1,24 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://b45up1xg1qnlo"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_eoswi"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_eoswi") +region = Rect2(36, 36, 12, 12) + +[resource] +script = ExtResource("2") +name = "metalscrap_gold" +description = "desc_metalscrap_gold" +max_stack_count = 20 +in_inventory_width = 1 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 8 +default_properties = { +"back_color": Color(0.67451, 0.270588, 0.972549, 1), +"price": { +"res://example/wyvernbox/item_types/consumable/coin_gold.tres": 10.0 +} +} diff --git a/example/Items/items/metalscrap_iron.tres b/example/Items/items/metalscrap_iron.tres new file mode 100644 index 0000000..5c4064f --- /dev/null +++ b/example/Items/items/metalscrap_iron.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://dyb3w176j3sco"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_61lme"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_61lme") +region = Rect2(36, 24, 12, 12) + +[resource] +script = ExtResource("2") +name = "metalscrap_iron" +description = "desc_metalscrap_iron" +max_stack_count = 20 +in_inventory_width = 1 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 8 +default_properties = {} diff --git a/example/Items/items/metalscrap_wyvernite.tres b/example/Items/items/metalscrap_wyvernite.tres new file mode 100644 index 0000000..d7f76cd --- /dev/null +++ b/example/Items/items/metalscrap_wyvernite.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://desvy1h36yy1s"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_bon0y"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_bon0y") +region = Rect2(48, 36, 12, 12) + +[resource] +script = ExtResource("2") +name = "metalscrap_wyvernite" +description = "desc_metalscrap_wyvernite" +max_stack_count = 20 +in_inventory_width = 1 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 8 +default_properties = { +"back_color": Color(0.67451, 0.270588, 0.972549, 1) +} diff --git a/example/Items/items/potion_blue.tres b/example/Items/items/potion_blue.tres new file mode 100644 index 0000000..fc40f4f --- /dev/null +++ b/example/Items/items/potion_blue.tres @@ -0,0 +1,24 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://b0l5g2tgwvm3b"] + +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="1"] +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("1") +region = Rect2(36, 0, 12, 24) + +[resource] +script = ExtResource("2") +name = "potion_blue" +description = "desc_potion_blue" +max_stack_count = 20 +in_inventory_width = 1 +in_inventory_height = 2 +texture = SubResource("1") +slot_flags = 4 +default_properties = { +"back_color": Color(0.67451, 0.270588, 0.972549, 1), +"price": { +"res://example/wyvernbox/item_types/consumable/coin_purple.tres": 5 +} +} diff --git a/example/Items/items/potion_purple.tres b/example/Items/items/potion_purple.tres new file mode 100644 index 0000000..f4170f6 --- /dev/null +++ b/example/Items/items/potion_purple.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://cbrsfa22sudf5"] + +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="1"] +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("1") +region = Rect2(24, 0, 12, 24) + +[resource] +script = ExtResource("2") +name = "potion_purple" +description = "desc_potion_purple" +max_stack_count = 20 +in_inventory_width = 1 +in_inventory_height = 2 +texture = SubResource("1") +slot_flags = 4 +default_properties = { +"back_color": Color(0.67451, 0.270588, 0.972549, 1) +} diff --git a/example/Items/items/potion_red.tres b/example/Items/items/potion_red.tres new file mode 100644 index 0000000..4ee5e9e --- /dev/null +++ b/example/Items/items/potion_red.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://crq178t8cp2g7"] + +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="1"] +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("1") +region = Rect2(12, 0, 12, 24) + +[resource] +script = ExtResource("2") +name = "potion_red" +description = "desc_potion_red" +max_stack_count = 20 +in_inventory_width = 1 +in_inventory_height = 2 +texture = SubResource("1") +slot_flags = 4 +default_properties = { +"back_color": Color(0.67451, 0.270588, 0.972549, 1) +} diff --git a/example/Items/items/ring_1.tres b/example/Items/items/ring_1.tres new file mode 100644 index 0000000..552bd22 --- /dev/null +++ b/example/Items/items/ring_1.tres @@ -0,0 +1,28 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://d1sgj2djflire"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="1"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_7y5px"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_7y5px") +region = Rect2(0, 192, 12, 12) + +[resource] +script = ExtResource("1") +name = "ring_1" +description = "desc_ring_1" +max_stack_count = 1 +in_inventory_width = 1 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 16 +default_properties = { +"back_color": Color(1, 0.65098, 0, 1), +"price": { +"res://example/wyvernbox/item_types/consumable/coin_gold.tres": 50, +"res://example/wyvernbox/item_types/consumable/coin_purple.tres": 10 +}, +"stats": { +"dodgerate": 8.0 +} +} diff --git a/example/Items/items/ring_2.tres b/example/Items/items/ring_2.tres new file mode 100644 index 0000000..38dfa41 --- /dev/null +++ b/example/Items/items/ring_2.tres @@ -0,0 +1,28 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://dwsqjeolbi2j6"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="1"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_a2wrg"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_a2wrg") +region = Rect2(12, 192, 12, 12) + +[resource] +script = ExtResource("1") +name = "ring_2" +description = "desc_ring_2" +max_stack_count = 1 +in_inventory_width = 1 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 16 +default_properties = { +"back_color": Color(1, 0.65098, 0, 1), +"price": { +"res://example/wyvernbox/item_types/consumable/coin_gold.tres": 50, +"res://example/wyvernbox/item_types/consumable/coin_purple.tres": 10 +}, +"stats": { +"health": 8.0 +} +} diff --git a/example/Items/items/scroll_enchant.tres b/example/Items/items/scroll_enchant.tres new file mode 100644 index 0000000..e67fea9 --- /dev/null +++ b/example/Items/items/scroll_enchant.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://7vy4rqrqnt4q"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_oismr"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_oismr") +region = Rect2(96, 24, 12, 24) + +[resource] +script = ExtResource("2") +name = "scroll_enchant" +description = "desc_scroll_enchant" +max_stack_count = 20 +in_inventory_width = 1 +in_inventory_height = 2 +texture = SubResource("1") +slot_flags = 6 +default_properties = { +"back_color": Color(0.67451, 0.270588, 0.972549, 1) +} diff --git a/example/Items/items/wand_purple.tres b/example/Items/items/wand_purple.tres new file mode 100644 index 0000000..f711f79 --- /dev/null +++ b/example/Items/items/wand_purple.tres @@ -0,0 +1,28 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://ckgvaqimbvnv8"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_8lhvp"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_8lhvp") +region = Rect2(0, 48, 12, 24) + +[resource] +script = ExtResource("2") +name = "wand_purple" +description = "desc_wand_purple" +max_stack_count = 1 +in_inventory_width = 1 +in_inventory_height = 2 +texture = SubResource("1") +slot_flags = 9 +default_properties = { +"back_color": Color(1, 0.65098, 0, 1), +"price": { +"res://example/wyvernbox/item_types/consumable/coin_gold.tres": 50, +"res://example/wyvernbox/item_types/consumable/coin_purple.tres": 10 +}, +"stats": { +"magic": 16.0 +} +} diff --git a/example/Items/items/wand_red.tres b/example/Items/items/wand_red.tres new file mode 100644 index 0000000..8274f25 --- /dev/null +++ b/example/Items/items/wand_red.tres @@ -0,0 +1,28 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://napa4vmvmphs"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_cihvk"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_cihvk") +region = Rect2(12, 48, 12, 24) + +[resource] +script = ExtResource("2") +name = "wand_red" +description = "desc_wand_red" +max_stack_count = 1 +in_inventory_width = 1 +in_inventory_height = 2 +texture = SubResource("1") +slot_flags = 9 +default_properties = { +"back_color": Color(1, 0.65098, 0, 1), +"price": { +"res://example/wyvernbox/item_types/consumable/coin_gold.tres": 50, +"res://example/wyvernbox/item_types/consumable/coin_purple.tres": 10 +}, +"stats": { +"spell_damage": 8.0 +} +} diff --git a/example/Items/items/wood.tres b/example/Items/items/wood.tres new file mode 100644 index 0000000..423b478 --- /dev/null +++ b/example/Items/items/wood.tres @@ -0,0 +1,19 @@ +[gd_resource type="Resource" load_steps=4 format=3 uid="uid://uge4rk0vtwxs"] + +[ext_resource type="Script" path="res://example/Items/item_type.gd" id="2"] +[ext_resource type="Texture2D" uid="uid://dwi4ioxeauoc4" path="res://example/Items/item_icons/items.png" id="2_7ia04"] + +[sub_resource type="AtlasTexture" id="1"] +atlas = ExtResource("2_7ia04") +region = Rect2(60, 36, 24, 12) + +[resource] +script = ExtResource("2") +name = "wood" +description = "desc_wood" +max_stack_count = 20 +in_inventory_width = 2 +in_inventory_height = 1 +texture = SubResource("1") +slot_flags = 8 +default_properties = {} diff --git a/example/Random Upgrades/icons/all_icons.png b/example/Random Upgrades/icons/all_icons.png new file mode 100644 index 0000000..71e7fe2 Binary files /dev/null and b/example/Random Upgrades/icons/all_icons.png differ diff --git a/example/Random Upgrades/icons/all_icons.png.import b/example/Random Upgrades/icons/all_icons.png.import new file mode 100644 index 0000000..40d9e97 --- /dev/null +++ b/example/Random Upgrades/icons/all_icons.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b7e3wp7i33ye5" +path="res://.godot/imported/all_icons.png-28909f8bd099d79f5d095eb93a9167e6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://example/Random Upgrades/icons/all_icons.png" +dest_files=["res://.godot/imported/all_icons.png-28909f8bd099d79f5d095eb93a9167e6.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/example/Random Upgrades/icons/all_icons/all_icons_1.tres b/example/Random Upgrades/icons/all_icons/all_icons_1.tres new file mode 100644 index 0000000..d3a38a3 --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_1.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://c3bx6kf7frbwk"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1"] + +[resource] +atlas = ExtResource("1") +region = Rect2(0, 0, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_10.tres b/example/Random Upgrades/icons/all_icons/all_icons_10.tres new file mode 100644 index 0000000..4131f8c --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_10.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://cak6lra5ej68c"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1_6pmrx"] + +[resource] +atlas = ExtResource("1_6pmrx") +region = Rect2(64, 128, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_11.tres b/example/Random Upgrades/icons/all_icons/all_icons_11.tres new file mode 100644 index 0000000..5ae6a28 --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_11.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://dkc8d2p0xbl1n"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1_lk0lg"] + +[resource] +atlas = ExtResource("1_lk0lg") +region = Rect2(128, 128, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_12.tres b/example/Random Upgrades/icons/all_icons/all_icons_12.tres new file mode 100644 index 0000000..1397909 --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_12.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://ciiykhulvckp7"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1_fd56b"] + +[resource] +atlas = ExtResource("1_fd56b") +region = Rect2(192, 128, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_13.tres b/example/Random Upgrades/icons/all_icons/all_icons_13.tres new file mode 100644 index 0000000..cbabc98 --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_13.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://dki1d3uksoyfj"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1_ds6ve"] + +[resource] +atlas = ExtResource("1_ds6ve") +region = Rect2(0, 192, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_14.tres b/example/Random Upgrades/icons/all_icons/all_icons_14.tres new file mode 100644 index 0000000..303ee64 --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_14.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://cpenn4qsfhx28"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1_icesd"] + +[resource] +atlas = ExtResource("1_icesd") +region = Rect2(64, 192, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_15.tres b/example/Random Upgrades/icons/all_icons/all_icons_15.tres new file mode 100644 index 0000000..3de416c --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_15.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://cm6cb8uou75x0"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1_mlqxi"] + +[resource] +atlas = ExtResource("1_mlqxi") +region = Rect2(128, 192, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_16.tres b/example/Random Upgrades/icons/all_icons/all_icons_16.tres new file mode 100644 index 0000000..fe9075e --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_16.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://0c7ngrkwn42u"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1_jk82p"] + +[resource] +atlas = ExtResource("1_jk82p") +region = Rect2(192, 192, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_2.tres b/example/Random Upgrades/icons/all_icons/all_icons_2.tres new file mode 100644 index 0000000..405fe32 --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_2.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://dfpwu4ra3fxgx"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1"] + +[resource] +atlas = ExtResource("1") +region = Rect2(64, 0, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_3.tres b/example/Random Upgrades/icons/all_icons/all_icons_3.tres new file mode 100644 index 0000000..8bc87b0 --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_3.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://d38giyxvkhl6g"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1"] + +[resource] +atlas = ExtResource("1") +region = Rect2(128, 0, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_4.tres b/example/Random Upgrades/icons/all_icons/all_icons_4.tres new file mode 100644 index 0000000..517e84f --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_4.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://cluvoehgeqmcu"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1"] + +[resource] +atlas = ExtResource("1") +region = Rect2(192, 0, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_5.tres b/example/Random Upgrades/icons/all_icons/all_icons_5.tres new file mode 100644 index 0000000..8363f7b --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_5.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://djjpa8lluue1g"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1"] + +[resource] +atlas = ExtResource("1") +region = Rect2(0, 64, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_6.tres b/example/Random Upgrades/icons/all_icons/all_icons_6.tres new file mode 100644 index 0000000..df97e79 --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_6.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://butx3l1jdcgcc"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1_em1jn"] + +[resource] +atlas = ExtResource("1_em1jn") +region = Rect2(64, 64, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_7.tres b/example/Random Upgrades/icons/all_icons/all_icons_7.tres new file mode 100644 index 0000000..bfe8fdb --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_7.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://dfhgifwrrigrw"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1_bpiay"] + +[resource] +atlas = ExtResource("1_bpiay") +region = Rect2(128, 64, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_8.tres b/example/Random Upgrades/icons/all_icons/all_icons_8.tres new file mode 100644 index 0000000..640155a --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_8.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://dacww8ptt8uyo"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1_mbxiu"] + +[resource] +atlas = ExtResource("1_mbxiu") +region = Rect2(192, 64, 64, 64) diff --git a/example/Random Upgrades/icons/all_icons/all_icons_9.tres b/example/Random Upgrades/icons/all_icons/all_icons_9.tres new file mode 100644 index 0000000..0c97341 --- /dev/null +++ b/example/Random Upgrades/icons/all_icons/all_icons_9.tres @@ -0,0 +1,7 @@ +[gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://dbbgxcs806sy8"] + +[ext_resource type="Texture2D" uid="uid://b7e3wp7i33ye5" path="res://example/Random Upgrades/icons/all_icons.png" id="1_bw3gq"] + +[resource] +atlas = ExtResource("1_bw3gq") +region = Rect2(0, 128, 64, 64) diff --git a/example/Random Upgrades/new scene.tscn b/example/Random Upgrades/new scene.tscn new file mode 100644 index 0000000..cf94da5 --- /dev/null +++ b/example/Random Upgrades/new scene.tscn @@ -0,0 +1,31 @@ +[gd_scene format=3 uid="uid://b4cix5ebtpdbf"] + +[node name="Node2D" type="Node2D"] + +[node name="ColorRect" type="ColorRect" parent="."] +offset_left = 363.0 +offset_top = 83.0 +offset_right = 718.0 +offset_bottom = 632.0 +color = Color(0, 1, 0.0156863, 1) + +[node name="ColorRect2" type="ColorRect" parent="."] +offset_left = 833.0 +offset_top = 304.0 +offset_right = 1095.0 +offset_bottom = 653.0 +color = Color(0, 0.905882, 1, 1) + +[node name="ColorRect3" type="ColorRect" parent="."] +offset_left = 553.0 +offset_top = 491.0 +offset_right = 929.0 +offset_bottom = 770.0 +color = Color(0, 0.0156863, 1, 1) + +[node name="ColorRect4" type="ColorRect" parent="."] +offset_left = 746.0 +offset_top = 397.0 +offset_right = 1077.0 +offset_bottom = 632.0 +color = Color(0.686275, 0, 1, 1) diff --git a/example/Random Upgrades/upgrade_data.gd b/example/Random Upgrades/upgrade_data.gd new file mode 100644 index 0000000..915857c --- /dev/null +++ b/example/Random Upgrades/upgrade_data.gd @@ -0,0 +1,30 @@ +@tool +class_name UpgradeData +extends Resource + +enum Attributes { + Strength = 0, + Magic, + Endurance, + Agility, + Luck, + Mastery = 128, +} + +@export var color1 := Color.WHITE +@export var max_duplicates := 0 +@export var tags : Array[String] +@export_enum("Weapon", "Passive", "Mastery") var type := 0 +@export var attributes : Array[Attributes] +@export var icon : Texture +@export var custom_scene : PackedScene +@export var prerequisites : Array[UpgradeData] +@export var color2 := Color.WHITE +@export var base_weight := 10.0 +@export var is_notable := false +@export_multiline var multiplier_per_tag := "" +@export_multiline var multiplier_if_tag_present := "" +@export_multiline var multiplier_if_tag_not_present := "" +@export_multiline var max_tags_present := "" +@export var list_item_delimeter := " " +@export var list_row_delimeter := ";" diff --git a/example/Random Upgrades/upgrades/elemental.tres b/example/Random Upgrades/upgrades/elemental.tres new file mode 100644 index 0000000..b0a6db6 --- /dev/null +++ b/example/Random Upgrades/upgrades/elemental.tres @@ -0,0 +1,25 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=3 format=3 uid="uid://8m6y2o6tbmpn"] + +[ext_resource type="Texture2D" uid="uid://butx3l1jdcgcc" path="res://example/Random Upgrades/icons/all_icons/all_icons_6.tres" id="1_utkae"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="2"] + +[resource] +resource_name = "Upgrade: Elemental Damage" +script = ExtResource("2") +color1 = Color(1, 1, 1, 1) +max_duplicates = 9 +tags = Array[String](["elemental"]) +type = 1 +attributes = Array[int]([1]) +icon = ExtResource("1_utkae") +prerequisites = Array[ExtResource("2")]([]) +color2 = Color(0.964706, 0.298039, 0.298039, 1) +base_weight = 10.0 +is_notable = false +multiplier_per_tag = "" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "elemental 0" +max_tags_present = "" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades/health.tres b/example/Random Upgrades/upgrades/health.tres new file mode 100644 index 0000000..3cce2ba --- /dev/null +++ b/example/Random Upgrades/upgrades/health.tres @@ -0,0 +1,25 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=3 format=3 uid="uid://dys7hpijn82t0"] + +[ext_resource type="Texture2D" uid="uid://c3bx6kf7frbwk" path="res://example/Random Upgrades/icons/all_icons/all_icons_1.tres" id="1"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="2"] + +[resource] +resource_name = "Upgrade: Health" +script = ExtResource("2") +color1 = Color(1, 1, 1, 1) +max_duplicates = 9 +tags = Array[String](["health", "melee"]) +type = 1 +attributes = Array[int]([2]) +icon = ExtResource("1") +prerequisites = Array[ExtResource("2")]([]) +color2 = Color(0.129412, 1, 0.243137, 1) +base_weight = 10.0 +is_notable = false +multiplier_per_tag = "strength 1.5 melee 2.0" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "" +max_tags_present = "" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades/mastery_magic.tres b/example/Random Upgrades/upgrades/mastery_magic.tres new file mode 100644 index 0000000..534709f --- /dev/null +++ b/example/Random Upgrades/upgrades/mastery_magic.tres @@ -0,0 +1,28 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=6 format=3 uid="uid://2totlbwc40e8"] + +[ext_resource type="Texture2D" uid="uid://djjpa8lluue1g" path="res://example/Random Upgrades/icons/all_icons/all_icons_5.tres" id="1_ardng"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="2"] +[ext_resource type="Resource" uid="uid://rjxr4qtfc6qd" path="res://example/Random Upgrades/upgrades/weapons/weapon_fireball.tres" id="2_485ad"] +[ext_resource type="Resource" uid="uid://djqq1lqaevth5" path="res://example/Random Upgrades/upgrades/weapons/weapon_blizzard.tres" id="3_xnxxn"] +[ext_resource type="Resource" uid="uid://b0kdw067vtgvn" path="res://example/Random Upgrades/upgrades/weapons/weapon_lightning.tres" id="4_kn0kg"] + +[resource] +resource_name = "Mastery: Magic" +script = ExtResource("2") +color1 = Color(1, 0.847059, 0.160784, 1) +max_duplicates = 9 +tags = Array[String](["magic", "mastery"]) +type = 2 +attributes = Array[int]([1, 1, 4, 128]) +icon = ExtResource("1_ardng") +prerequisites = Array[ExtResource("2")]([ExtResource("2_485ad"), ExtResource("3_xnxxn"), ExtResource("4_kn0kg")]) +color2 = Color(0.407843, 0.192157, 0.827451, 1) +base_weight = 1.0 +is_notable = true +multiplier_per_tag = "magic 1.2" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "magic 0" +max_tags_present = "" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades/mastery_strength.tres b/example/Random Upgrades/upgrades/mastery_strength.tres new file mode 100644 index 0000000..2f25fcc --- /dev/null +++ b/example/Random Upgrades/upgrades/mastery_strength.tres @@ -0,0 +1,28 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=6 format=3 uid="uid://d1suh8iai43st"] + +[ext_resource type="Texture2D" uid="uid://dfpwu4ra3fxgx" path="res://example/Random Upgrades/icons/all_icons/all_icons_2.tres" id="1_442ey"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="2"] +[ext_resource type="Resource" uid="uid://cux4x0qopwiqk" path="res://example/Random Upgrades/upgrades/weapons/weapon_dagger.tres" id="2_kb33p"] +[ext_resource type="Resource" uid="uid://b78jqcpgef2ud" path="res://example/Random Upgrades/upgrades/weapons/weapon_axe.tres" id="3_tt25f"] +[ext_resource type="Resource" uid="uid://xl0yx8uq6bfp" path="res://example/Random Upgrades/upgrades/weapons/weapon_spear.tres" id="4_kpsn8"] + +[resource] +resource_name = "Mastery: Strength" +script = ExtResource("2") +color1 = Color(1, 0.847059, 0.160784, 1) +max_duplicates = 9 +tags = Array[String](["strength", "mastery"]) +type = 2 +attributes = Array[int]([0, 0, 4, 128]) +icon = ExtResource("1_442ey") +prerequisites = Array[ExtResource("2")]([ExtResource("2_kb33p"), ExtResource("3_tt25f"), ExtResource("4_kpsn8")]) +color2 = Color(0.992157, 0.941176, 0.2, 1) +base_weight = 1.0 +is_notable = true +multiplier_per_tag = "strength 1.2" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "strength 0" +max_tags_present = "" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades/up_aoe.tres b/example/Random Upgrades/upgrades/up_aoe.tres new file mode 100644 index 0000000..37ff9cc --- /dev/null +++ b/example/Random Upgrades/upgrades/up_aoe.tres @@ -0,0 +1,25 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=3 format=3 uid="uid://2y7extlq12d5"] + +[ext_resource type="Texture2D" uid="uid://butx3l1jdcgcc" path="res://example/Random Upgrades/icons/all_icons/all_icons_6.tres" id="1_prpsx"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="2"] + +[resource] +resource_name = "Upgrade: Area of Effect" +script = ExtResource("2") +color1 = Color(1, 1, 1, 1) +max_duplicates = 4 +tags = Array[String](["aoe"]) +type = 1 +attributes = Array[int]([3]) +icon = ExtResource("1_prpsx") +prerequisites = Array[ExtResource("2")]([]) +color2 = Color(0.964706, 0.298039, 0.298039, 1) +base_weight = 10.0 +is_notable = false +multiplier_per_tag = "" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "aoe 0" +max_tags_present = "" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades/up_magic.tres b/example/Random Upgrades/upgrades/up_magic.tres new file mode 100644 index 0000000..aabe734 --- /dev/null +++ b/example/Random Upgrades/upgrades/up_magic.tres @@ -0,0 +1,25 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=3 format=3 uid="uid://ce2kulhm7amkp"] + +[ext_resource type="Texture2D" uid="uid://djjpa8lluue1g" path="res://example/Random Upgrades/icons/all_icons/all_icons_5.tres" id="1_we1lq"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="2"] + +[resource] +resource_name = "Upgrade: Magic" +script = ExtResource("2") +color1 = Color(1, 1, 1, 1) +max_duplicates = 9 +tags = Array[String](["magic"]) +type = 1 +attributes = Array[int]([1]) +icon = ExtResource("1_we1lq") +prerequisites = Array[ExtResource("2")]([]) +color2 = Color(0.188235, 0.45098, 0.901961, 1) +base_weight = 10.0 +is_notable = false +multiplier_per_tag = "" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "magic 0" +max_tags_present = "" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades/up_strength.tres b/example/Random Upgrades/upgrades/up_strength.tres new file mode 100644 index 0000000..85c443c --- /dev/null +++ b/example/Random Upgrades/upgrades/up_strength.tres @@ -0,0 +1,25 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=3 format=3 uid="uid://c6hsg3j74vm56"] + +[ext_resource type="Texture2D" uid="uid://dfpwu4ra3fxgx" path="res://example/Random Upgrades/icons/all_icons/all_icons_2.tres" id="1"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="2"] + +[resource] +resource_name = "Upgrade: Strength" +script = ExtResource("2") +color1 = Color(1, 1, 1, 1) +max_duplicates = 9 +tags = Array[String](["strength"]) +type = 1 +attributes = Array[int]([0]) +icon = ExtResource("1") +prerequisites = Array[ExtResource("2")]([]) +color2 = Color(0.980392, 0.584314, 0.203922, 1) +base_weight = 10.0 +is_notable = false +multiplier_per_tag = "" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "strength 0" +max_tags_present = "" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades/weapons/weapon_axe.tres b/example/Random Upgrades/upgrades/weapons/weapon_axe.tres new file mode 100644 index 0000000..3f2ca4a --- /dev/null +++ b/example/Random Upgrades/upgrades/weapons/weapon_axe.tres @@ -0,0 +1,25 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=3 format=3 uid="uid://b78jqcpgef2ud"] + +[ext_resource type="Texture2D" uid="uid://d38giyxvkhl6g" path="res://example/Random Upgrades/icons/all_icons/all_icons_3.tres" id="1_mrwdr"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="2_ug2lv"] + +[resource] +resource_name = "Weapon: Axe" +script = ExtResource("2_ug2lv") +color1 = Color(0.635294, 0.760784, 1, 1) +max_duplicates = 1 +tags = Array[String](["strength", "melee", "weapon"]) +type = 0 +attributes = Array[int]([0, 2]) +icon = ExtResource("1_mrwdr") +prerequisites = Array[ExtResource("2_ug2lv")]([]) +color2 = Color(0.980392, 0.584314, 0.203922, 1) +base_weight = 10.0 +is_notable = false +multiplier_per_tag = "strength 2.0" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "" +max_tags_present = "weapon 4" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades/weapons/weapon_blizzard.tres b/example/Random Upgrades/upgrades/weapons/weapon_blizzard.tres new file mode 100644 index 0000000..7386128 --- /dev/null +++ b/example/Random Upgrades/upgrades/weapons/weapon_blizzard.tres @@ -0,0 +1,25 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=3 format=3 uid="uid://djqq1lqaevth5"] + +[ext_resource type="Texture2D" uid="uid://cluvoehgeqmcu" path="res://example/Random Upgrades/icons/all_icons/all_icons_4.tres" id="1_xleln"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="2"] + +[resource] +resource_name = "Weapon: Blizzard" +script = ExtResource("2") +color1 = Color(0.635294, 0.760784, 1, 1) +max_duplicates = 1 +tags = Array[String](["weapon", "magic", "elemental"]) +type = 0 +attributes = Array[int]([1, 2]) +icon = ExtResource("1_xleln") +prerequisites = Array[ExtResource("2")]([]) +color2 = Color(0.189457, 0.452246, 0.902344, 1) +base_weight = 10.0 +is_notable = false +multiplier_per_tag = "magic 2.0" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "" +max_tags_present = "weapon 4" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades/weapons/weapon_chaos_blast.tres b/example/Random Upgrades/upgrades/weapons/weapon_chaos_blast.tres new file mode 100644 index 0000000..81e849b --- /dev/null +++ b/example/Random Upgrades/upgrades/weapons/weapon_chaos_blast.tres @@ -0,0 +1,27 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=4 format=3 uid="uid://60buw33oe30f"] + +[ext_resource type="PackedScene" uid="uid://b4cix5ebtpdbf" path="res://example/Random Upgrades/new scene.tscn" id="1_wk78o"] +[ext_resource type="Texture2D" uid="uid://cluvoehgeqmcu" path="res://example/Random Upgrades/icons/all_icons/all_icons_4.tres" id="2_yni6v"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="3_lwnh6"] + +[resource] +resource_name = "Weapon: Chaos Blast" +script = ExtResource("3_lwnh6") +color1 = Color(0.635294, 0.760784, 1, 1) +max_duplicates = 1 +tags = Array[String](["weapon", "magic", "projectile", "legendary"]) +type = 0 +attributes = Array[int]([1, 1, 1, 3]) +icon = ExtResource("2_yni6v") +custom_scene = ExtResource("1_wk78o") +prerequisites = Array[ExtResource("3_lwnh6")]([]) +color2 = Color(0.407843, 0.192157, 0.827451, 1) +base_weight = 1.0 +is_notable = true +multiplier_per_tag = "magic 2.0" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "" +max_tags_present = "weapon 4" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades/weapons/weapon_dagger.tres b/example/Random Upgrades/upgrades/weapons/weapon_dagger.tres new file mode 100644 index 0000000..ac73406 --- /dev/null +++ b/example/Random Upgrades/upgrades/weapons/weapon_dagger.tres @@ -0,0 +1,25 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=3 format=3 uid="uid://cux4x0qopwiqk"] + +[ext_resource type="Texture2D" uid="uid://d38giyxvkhl6g" path="res://example/Random Upgrades/icons/all_icons/all_icons_3.tres" id="1"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="2"] + +[resource] +resource_name = "Weapon: Daggers" +script = ExtResource("2") +color1 = Color(0.635294, 0.760784, 1, 1) +max_duplicates = 1 +tags = Array[String](["weapon", "strength", "projectile"]) +type = 0 +attributes = Array[int]([0, 3]) +icon = ExtResource("1") +prerequisites = Array[ExtResource("2")]([]) +color2 = Color(0.980392, 0.584314, 0.203922, 1) +base_weight = 10.0 +is_notable = false +multiplier_per_tag = "strength 2.0" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "" +max_tags_present = "weapon 4" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades/weapons/weapon_fireball.tres b/example/Random Upgrades/upgrades/weapons/weapon_fireball.tres new file mode 100644 index 0000000..2dc4f1d --- /dev/null +++ b/example/Random Upgrades/upgrades/weapons/weapon_fireball.tres @@ -0,0 +1,25 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=3 format=3 uid="uid://rjxr4qtfc6qd"] + +[ext_resource type="Texture2D" uid="uid://cluvoehgeqmcu" path="res://example/Random Upgrades/icons/all_icons/all_icons_4.tres" id="1"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="2"] + +[resource] +resource_name = "Weapon: Fireball" +script = ExtResource("2") +color1 = Color(0.635294, 0.760784, 1, 1) +max_duplicates = 1 +tags = Array[String](["weapon", "magic", "projectile", "elemental"]) +type = 0 +attributes = Array[int]([1, 2]) +icon = ExtResource("1") +prerequisites = Array[ExtResource("2")]([]) +color2 = Color(0.189457, 0.452246, 0.902344, 1) +base_weight = 10.0 +is_notable = false +multiplier_per_tag = "magic 2.0" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "" +max_tags_present = "weapon 4" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades/weapons/weapon_giga_sword.tres b/example/Random Upgrades/upgrades/weapons/weapon_giga_sword.tres new file mode 100644 index 0000000..dd29518 --- /dev/null +++ b/example/Random Upgrades/upgrades/weapons/weapon_giga_sword.tres @@ -0,0 +1,27 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=4 format=3 uid="uid://c1mrcevxrm5kv"] + +[ext_resource type="PackedScene" uid="uid://b4cix5ebtpdbf" path="res://example/Random Upgrades/new scene.tscn" id="2"] +[ext_resource type="Texture2D" uid="uid://d38giyxvkhl6g" path="res://example/Random Upgrades/icons/all_icons/all_icons_3.tres" id="2_kfnh0"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="3"] + +[resource] +resource_name = "Weapon: Giga Sword" +script = ExtResource("3") +color1 = Color(0.635294, 0.760784, 1, 1) +max_duplicates = 1 +tags = Array[String](["weapon", "strength", "melee", "legendary"]) +type = 0 +attributes = Array[int]([0, 0, 0, 2]) +icon = ExtResource("2_kfnh0") +custom_scene = ExtResource("2") +prerequisites = Array[ExtResource("3")]([]) +color2 = Color(0.992157, 0.941176, 0.2, 1) +base_weight = 1.0 +is_notable = true +multiplier_per_tag = "strength 2.0" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "" +max_tags_present = "weapon 4" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades/weapons/weapon_lightning.tres b/example/Random Upgrades/upgrades/weapons/weapon_lightning.tres new file mode 100644 index 0000000..909efcf --- /dev/null +++ b/example/Random Upgrades/upgrades/weapons/weapon_lightning.tres @@ -0,0 +1,25 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=3 format=3 uid="uid://b0kdw067vtgvn"] + +[ext_resource type="Texture2D" uid="uid://cluvoehgeqmcu" path="res://example/Random Upgrades/icons/all_icons/all_icons_4.tres" id="1"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="2"] + +[resource] +resource_name = "Weapon: Lightning" +script = ExtResource("2") +color1 = Color(0.635294, 0.760784, 1, 1) +max_duplicates = 1 +tags = Array[String](["weapon", "magic", "elemental"]) +type = 0 +attributes = Array[int]([1, 3]) +icon = ExtResource("1") +prerequisites = Array[ExtResource("2")]([]) +color2 = Color(0.189457, 0.452246, 0.902344, 1) +base_weight = 10.0 +is_notable = false +multiplier_per_tag = "magic 2.0" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "" +max_tags_present = "weapon 4" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades/weapons/weapon_spear.tres b/example/Random Upgrades/upgrades/weapons/weapon_spear.tres new file mode 100644 index 0000000..96e2943 --- /dev/null +++ b/example/Random Upgrades/upgrades/weapons/weapon_spear.tres @@ -0,0 +1,25 @@ +[gd_resource type="Resource" script_class="UpgradeData" load_steps=3 format=3 uid="uid://xl0yx8uq6bfp"] + +[ext_resource type="Texture2D" uid="uid://d38giyxvkhl6g" path="res://example/Random Upgrades/icons/all_icons/all_icons_3.tres" id="1"] +[ext_resource type="Script" path="res://example/Random Upgrades/upgrade_data.gd" id="2"] + +[resource] +resource_name = "Weapon: Spear" +script = ExtResource("2") +color1 = Color(0.635294, 0.760784, 1, 1) +max_duplicates = 1 +tags = Array[String](["weapon", "strength", "melee"]) +type = 0 +attributes = Array[int]([0, 3]) +icon = ExtResource("1") +prerequisites = Array[ExtResource("2")]([]) +color2 = Color(0.980392, 0.584314, 0.203922, 1) +base_weight = 10.0 +is_notable = false +multiplier_per_tag = "strength 2.0" +multiplier_if_tag_present = "" +multiplier_if_tag_not_present = "" +max_tags_present = "weapon 4" +list_item_delimeter = " " +list_row_delimeter = " +" diff --git a/example/Random Upgrades/upgrades_csv/upgrades.attributes.translation b/example/Random Upgrades/upgrades_csv/upgrades.attributes.translation new file mode 100644 index 0000000..049feeb Binary files /dev/null and b/example/Random Upgrades/upgrades_csv/upgrades.attributes.translation differ diff --git a/example/Random Upgrades/upgrades_csv/upgrades.base.translation b/example/Random Upgrades/upgrades_csv/upgrades.base.translation new file mode 100644 index 0000000..f441403 Binary files /dev/null and b/example/Random Upgrades/upgrades_csv/upgrades.base.translation differ diff --git a/example/Random Upgrades/upgrades_csv/upgrades.color1.translation b/example/Random Upgrades/upgrades_csv/upgrades.color1.translation new file mode 100644 index 0000000..b963536 Binary files /dev/null and b/example/Random Upgrades/upgrades_csv/upgrades.color1.translation differ diff --git a/example/Random Upgrades/upgrades_csv/upgrades.color2.translation b/example/Random Upgrades/upgrades_csv/upgrades.color2.translation new file mode 100644 index 0000000..697f4a6 Binary files /dev/null and b/example/Random Upgrades/upgrades_csv/upgrades.color2.translation differ diff --git a/example/Random Upgrades/upgrades_csv/upgrades.csv b/example/Random Upgrades/upgrades_csv/upgrades.csv new file mode 100644 index 0000000..062c6f6 --- /dev/null +++ b/example/Random Upgrades/upgrades_csv/upgrades.csv @@ -0,0 +1,31 @@ +resource_path,color1,max_duplicates,tags,type,attributes,icon,custom_scene,prerequisites,color2,base_weight,is_notable,multiplier_per_tag,multiplier_if_tag_present,multiplier_if_tag_not_present,max_tags_present,list_item_delimeter,list_row_delimeter +elemental,ffffffff,9,"[""elemental""]",Passive,[1],res://example/Random Upgrades/icons/all_icons/all_icons_6.tres,,[],f64c4cff,10,No,,,elemental 0,, ," +" +health,ffffffff,9,"[""health"", ""melee""]",Passive,[2],res://example/Random Upgrades/icons/all_icons/all_icons_1.tres,,[],21ff3eff,10,No,strength 1.5 melee 2.0,,,, ," +" +mastery_magic,ffd829ff,9,"[""magic"", ""mastery""]",Mastery,"[1, 1, 4, 128]",res://example/Random Upgrades/icons/all_icons/all_icons_5.tres,,"[, , ]",6831d3ff,1,Yes,magic 1.2,,magic 0,, ," +" +mastery_strength,ffd829ff,9,"[""strength"", ""mastery""]",Mastery,"[0, 0, 4, 128]",res://example/Random Upgrades/icons/all_icons/all_icons_2.tres,,"[, , ]",fdf033ff,1,Yes,strength 1.2,,strength 0,, ," +" +up_aoe,ffffffff,4,"[""aoe""]",Passive,[3],res://example/Random Upgrades/icons/all_icons/all_icons_6.tres,,[],f64c4cff,10,No,,,aoe 0,, ," +" +up_magic,ffffffff,9,"[""magic""]",Passive,[1],res://example/Random Upgrades/icons/all_icons/all_icons_5.tres,,[],3073e6ff,10,No,,,magic 0,, ," +" +up_strength,ffffffff,9,"[""strength""]",Passive,[0],res://example/Random Upgrades/icons/all_icons/all_icons_2.tres,,[],fa9534ff,10,No,,,strength 0,, ," +" +weapon_axe,a2c2ffff,1,"[""strength"", ""melee"", ""weapon""]",Weapon,"[0, 2]",res://example/Random Upgrades/icons/all_icons/all_icons_3.tres,,[],fa9534ff,10,No,strength 2.0,,,weapon 4, ," +" +weapon_blizzard,a2c2ffff,1,"[""weapon"", ""magic"", ""elemental""]",Weapon,"[1, 2]",res://example/Random Upgrades/icons/all_icons/all_icons_4.tres,,[],3073e6ff,10,No,magic 2.0,,,weapon 4, ," +" +weapon_chaos_blast,a2c2ffff,1,"[""weapon"", ""magic"", ""projectile"", ""legendary""]",Weapon,"[1, 1, 1, 3]",res://example/Random Upgrades/icons/all_icons/all_icons_4.tres,res://example/Random Upgrades/new scene.tscn,[],6831d3ff,1,Yes,magic 2.0,,,weapon 4, ," +" +weapon_dagger,a2c2ffff,1,"[""weapon"", ""strength"", ""projectile""]",Weapon,"[0, 3]",res://example/Random Upgrades/icons/all_icons/all_icons_3.tres,,[],fa9534ff,10,No,strength 2.0,,,weapon 4, ," +" +weapon_fireball,a2c2ffff,1,"[""weapon"", ""magic"", ""projectile"", ""elemental""]",Weapon,"[1, 2]",res://example/Random Upgrades/icons/all_icons/all_icons_4.tres,,[],3073e6ff,10,No,magic 2.0,,,weapon 4, ," +" +weapon_giga_sword,a2c2ffff,1,"[""weapon"", ""strength"", ""melee"", ""legendary""]",Weapon,"[0, 0, 0, 2]",res://example/Random Upgrades/icons/all_icons/all_icons_3.tres,res://example/Random Upgrades/new scene.tscn,[],fdf033ff,1,Yes,strength 2.0,,,weapon 4, ," +" +weapon_lightning,a2c2ffff,1,"[""weapon"", ""magic"", ""elemental""]",Weapon,"[1, 3]",res://example/Random Upgrades/icons/all_icons/all_icons_4.tres,,[],3073e6ff,10,No,magic 2.0,,,weapon 4, ," +" +weapon_spear,a2c2ffff,1,"[""weapon"", ""strength"", ""melee""]",Weapon,"[0, 3]",res://example/Random Upgrades/icons/all_icons/all_icons_3.tres,,[],fa9534ff,10,No,strength 2.0,,,weapon 4, ," +" diff --git a/example/Random Upgrades/upgrades_csv/upgrades.csv.import b/example/Random Upgrades/upgrades_csv/upgrades.csv.import new file mode 100644 index 0000000..e73066f --- /dev/null +++ b/example/Random Upgrades/upgrades_csv/upgrades.csv.import @@ -0,0 +1,17 @@ +[remap] + +importer="csv_translation" +type="Translation" +uid="uid://bd5cgapnqclvg" + +[deps] + +files=["res://example/Random Upgrades/upgrades_csv/upgrades.color1.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.max.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.tags.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.type.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.attributes.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.icon.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.custom.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.prerequisites.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.color2.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.base.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.is.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.multiplier.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.multiplier.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.multiplier.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.max.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.list.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.list.translation"] + +source_file="res://example/Random Upgrades/upgrades_csv/upgrades.csv" +dest_files=["res://example/Random Upgrades/upgrades_csv/upgrades.color1.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.max.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.tags.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.type.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.attributes.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.icon.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.custom.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.prerequisites.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.color2.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.base.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.is.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.multiplier.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.multiplier.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.multiplier.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.max.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.list.translation", "res://example/Random Upgrades/upgrades_csv/upgrades.list.translation"] + +[params] + +compress=true +delimiter=0 diff --git a/example/Random Upgrades/upgrades_csv/upgrades.custom.translation b/example/Random Upgrades/upgrades_csv/upgrades.custom.translation new file mode 100644 index 0000000..25b695e Binary files /dev/null and b/example/Random Upgrades/upgrades_csv/upgrades.custom.translation differ diff --git a/example/Random Upgrades/upgrades_csv/upgrades.icon.translation b/example/Random Upgrades/upgrades_csv/upgrades.icon.translation new file mode 100644 index 0000000..868f97b Binary files /dev/null and b/example/Random Upgrades/upgrades_csv/upgrades.icon.translation differ diff --git a/example/Random Upgrades/upgrades_csv/upgrades.is.translation b/example/Random Upgrades/upgrades_csv/upgrades.is.translation new file mode 100644 index 0000000..7e8d36b Binary files /dev/null and b/example/Random Upgrades/upgrades_csv/upgrades.is.translation differ diff --git a/example/Random Upgrades/upgrades_csv/upgrades.list.translation b/example/Random Upgrades/upgrades_csv/upgrades.list.translation new file mode 100644 index 0000000..3dd0c1e Binary files /dev/null and b/example/Random Upgrades/upgrades_csv/upgrades.list.translation differ diff --git a/example/Random Upgrades/upgrades_csv/upgrades.max.translation b/example/Random Upgrades/upgrades_csv/upgrades.max.translation new file mode 100644 index 0000000..3fbe229 Binary files /dev/null and b/example/Random Upgrades/upgrades_csv/upgrades.max.translation differ diff --git a/example/Random Upgrades/upgrades_csv/upgrades.multiplier.translation b/example/Random Upgrades/upgrades_csv/upgrades.multiplier.translation new file mode 100644 index 0000000..ee15d59 Binary files /dev/null and b/example/Random Upgrades/upgrades_csv/upgrades.multiplier.translation differ diff --git a/example/Random Upgrades/upgrades_csv/upgrades.prerequisites.translation b/example/Random Upgrades/upgrades_csv/upgrades.prerequisites.translation new file mode 100644 index 0000000..f02a5a7 Binary files /dev/null and b/example/Random Upgrades/upgrades_csv/upgrades.prerequisites.translation differ diff --git a/example/Random Upgrades/upgrades_csv/upgrades.tags.translation b/example/Random Upgrades/upgrades_csv/upgrades.tags.translation new file mode 100644 index 0000000..da39af5 Binary files /dev/null and b/example/Random Upgrades/upgrades_csv/upgrades.tags.translation differ diff --git a/example/Random Upgrades/upgrades_csv/upgrades.type.translation b/example/Random Upgrades/upgrades_csv/upgrades.type.translation new file mode 100644 index 0000000..f50f5d8 Binary files /dev/null and b/example/Random Upgrades/upgrades_csv/upgrades.type.translation differ diff --git a/render/process_material/slash_normal.tres b/render/process_material/slash_normal.tres index ea57a1b..2b353c0 100644 --- a/render/process_material/slash_normal.tres +++ b/render/process_material/slash_normal.tres @@ -1,4 +1,4 @@ -[gd_resource type="ParticleProcessMaterial" load_steps=3 format=3 uid="uid://dubkkji6sm8on"] +[gd_resource type="ParticleProcessMaterial" load_steps=5 format=3 uid="uid://dubkkji6sm8on"] [sub_resource type="Gradient" id="Gradient_fjosh"] offsets = PackedFloat32Array(0, 0.0894942, 0.684825, 1) @@ -7,6 +7,13 @@ colors = PackedColorArray(0.278431, 0.65098, 1, 0, 0.278431, 0.65098, 1, 1, 0.27 [sub_resource type="GradientTexture1D" id="GradientTexture1D_cypke"] gradient = SubResource("Gradient_fjosh") +[sub_resource type="Curve" id="Curve_8t5d6"] +_data = [Vector2(0, 0.901099), 0.0, 0.0, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="CurveTexture" id="CurveTexture_81bpg"] +curve = SubResource("Curve_8t5d6") + [resource] particle_flag_rotate_y = true angle_min = 180.0 @@ -17,6 +24,5 @@ angular_velocity_min = -720.0 angular_velocity_max = -720.0 gravity = Vector3(0, 0, 0) tangential_accel_min = -100.0 -scale_min = 0.5 -scale_max = 0.5 +scale_curve = SubResource("CurveTexture_81bpg") color_ramp = SubResource("GradientTexture1D_cypke") diff --git a/render/texture/particle/mask/mask5.png b/render/texture/particle/mask/mask5.png index cb8cbb3..3c5461b 100644 Binary files a/render/texture/particle/mask/mask5.png and b/render/texture/particle/mask/mask5.png differ diff --git a/resource/skill_animation/hero01_common_skill02.tres b/resource/skill_animation/hero01_common_skill02.tres index 87ddd4d..4a51b09 100644 --- a/resource/skill_animation/hero01_common_skill02.tres +++ b/resource/skill_animation/hero01_common_skill02.tres @@ -76,7 +76,7 @@ tracks/5/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }] } tracks/6/type = "method" @@ -90,7 +90,7 @@ tracks/6/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"cast_attack_particle" +"method": &"cast_attack_particle1" }] } tracks/7/type = "value" diff --git a/resource/skill_animation/hero01_fist_air_skill01.tres b/resource/skill_animation/hero01_fist_air_skill01.tres index 3f21f56..6d26485 100644 --- a/resource/skill_animation/hero01_fist_air_skill01.tres +++ b/resource/skill_animation/hero01_fist_air_skill01.tres @@ -91,7 +91,7 @@ tracks/6/keys = { "method": &"check_ground" }, { "args": [], -"method": &"attack" +"method": &"attack1" }] } tracks/7/type = "value" @@ -117,9 +117,9 @@ tracks/8/keys = { "transitions": PackedFloat32Array(1, 1), "values": [{ "args": [], -"method": &"cast_attack_particle" +"method": &"cast_attack_particle1" }, { "args": [], -"method": &"cast_attack_particle_release" +"method": &"cast_attack_particle2_release" }] } diff --git a/resource/skill_animation/hero01_fist_attack01.tres b/resource/skill_animation/hero01_fist_attack01.tres index cb4deeb..636a823 100644 --- a/resource/skill_animation/hero01_fist_attack01.tres +++ b/resource/skill_animation/hero01_fist_attack01.tres @@ -76,7 +76,7 @@ tracks/5/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }] } tracks/6/type = "method" @@ -90,7 +90,7 @@ tracks/6/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"cast_attack_particle" +"method": &"cast_attack_particle1" }] } tracks/7/type = "value" diff --git a/resource/skill_animation/hero01_fist_attack02.tres b/resource/skill_animation/hero01_fist_attack02.tres index d8aca4c..0e7324c 100644 --- a/resource/skill_animation/hero01_fist_attack02.tres +++ b/resource/skill_animation/hero01_fist_attack02.tres @@ -76,7 +76,7 @@ tracks/5/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }] } tracks/6/type = "method" @@ -90,7 +90,7 @@ tracks/6/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"cast_attack_particle" +"method": &"cast_attack_particle1" }] } tracks/7/type = "value" diff --git a/resource/skill_animation/hero01_fist_attack03.tres b/resource/skill_animation/hero01_fist_attack03.tres index 539c4a9..615e209 100644 --- a/resource/skill_animation/hero01_fist_attack03.tres +++ b/resource/skill_animation/hero01_fist_attack03.tres @@ -76,7 +76,7 @@ tracks/5/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }] } tracks/6/type = "method" @@ -90,7 +90,7 @@ tracks/6/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"cast_attack_particle" +"method": &"cast_attack_particle1" }] } tracks/7/type = "value" diff --git a/resource/skill_animation/hero01_fist_attack04.tres b/resource/skill_animation/hero01_fist_attack04.tres index bf13a65..4b5f40b 100644 --- a/resource/skill_animation/hero01_fist_attack04.tres +++ b/resource/skill_animation/hero01_fist_attack04.tres @@ -76,7 +76,7 @@ tracks/5/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }] } tracks/6/type = "method" @@ -90,7 +90,7 @@ tracks/6/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"cast_attack_particle" +"method": &"cast_attack_particle1" }] } tracks/7/type = "value" diff --git a/resource/skill_animation/hero01_fist_attack05.tres b/resource/skill_animation/hero01_fist_attack05.tres index a34ef7c..b1fec2d 100644 --- a/resource/skill_animation/hero01_fist_attack05.tres +++ b/resource/skill_animation/hero01_fist_attack05.tres @@ -76,7 +76,7 @@ tracks/5/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }] } tracks/6/type = "method" @@ -90,7 +90,7 @@ tracks/6/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"cast_attack_particle" +"method": &"cast_attack_particle1" }] } tracks/7/type = "value" diff --git a/resource/skill_animation/hero01_long_air_attack01.tres b/resource/skill_animation/hero01_long_air_attack01.tres index 7e92f33..e46ca8e 100644 --- a/resource/skill_animation/hero01_long_air_attack01.tres +++ b/resource/skill_animation/hero01_long_air_attack01.tres @@ -88,7 +88,7 @@ tracks/6/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }] } tracks/7/type = "method" @@ -102,7 +102,7 @@ tracks/7/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"cast_attack_particle" +"method": &"cast_attack_particle1" }] } tracks/8/type = "value" diff --git a/resource/skill_animation/hero01_long_air_attack02.tres b/resource/skill_animation/hero01_long_air_attack02.tres index 969fe90..93a47cd 100644 --- a/resource/skill_animation/hero01_long_air_attack02.tres +++ b/resource/skill_animation/hero01_long_air_attack02.tres @@ -88,7 +88,7 @@ tracks/6/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }] } tracks/7/type = "value" diff --git a/resource/skill_animation/hero01_long_air_attack03.tres b/resource/skill_animation/hero01_long_air_attack03.tres index fa36932..da69256 100644 --- a/resource/skill_animation/hero01_long_air_attack03.tres +++ b/resource/skill_animation/hero01_long_air_attack03.tres @@ -88,7 +88,7 @@ tracks/6/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }] } tracks/7/type = "value" diff --git a/resource/skill_animation/hero01_long_attack01.tres b/resource/skill_animation/hero01_long_attack01.tres index 4cbd12d..c7b0259 100644 --- a/resource/skill_animation/hero01_long_attack01.tres +++ b/resource/skill_animation/hero01_long_attack01.tres @@ -35,10 +35,10 @@ tracks/2/path = NodePath("Status:break_level") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0, 0.4, 0.7), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PackedFloat32Array(0, 0.3, 0.4, 0.7), +"transitions": PackedFloat32Array(1, 1, 1, 1), "update": 1, -"values": [0, 3, 4] +"values": [0, 1, 3, 4] } tracks/3/type = "value" tracks/3/imported = false @@ -75,7 +75,7 @@ tracks/5/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }] } tracks/6/type = "method" @@ -89,7 +89,7 @@ tracks/6/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"cast_attack_particle" +"method": &"cast_attack_particle1" }] } tracks/7/type = "value" diff --git a/resource/skill_animation/hero01_long_attack02.tres b/resource/skill_animation/hero01_long_attack02.tres index 392b2f2..27c08c3 100644 --- a/resource/skill_animation/hero01_long_attack02.tres +++ b/resource/skill_animation/hero01_long_attack02.tres @@ -75,7 +75,7 @@ tracks/5/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }] } tracks/6/type = "method" @@ -89,7 +89,7 @@ tracks/6/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"cast_attack_particle" +"method": &"cast_attack_particle1" }] } tracks/7/type = "value" diff --git a/resource/skill_animation/hero01_long_attack03.tres b/resource/skill_animation/hero01_long_attack03.tres index 78f80fa..2f6cc4f 100644 --- a/resource/skill_animation/hero01_long_attack03.tres +++ b/resource/skill_animation/hero01_long_attack03.tres @@ -76,10 +76,10 @@ tracks/5/keys = { "transitions": PackedFloat32Array(1, 1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }, { "args": [], -"method": &"attack" +"method": &"attack2" }] } tracks/6/type = "method" @@ -93,10 +93,10 @@ tracks/6/keys = { "transitions": PackedFloat32Array(1, 1), "values": [{ "args": [], -"method": &"cast_attack_particle" +"method": &"cast_attack_particle1" }, { "args": [], -"method": &"cast_attack_particle" +"method": &"cast_attack_particle2" }] } tracks/7/type = "value" diff --git a/resource/skill_animation/hero01_long_attack04.tres b/resource/skill_animation/hero01_long_attack04.tres index 8046ae2..1235dcd 100644 --- a/resource/skill_animation/hero01_long_attack04.tres +++ b/resource/skill_animation/hero01_long_attack04.tres @@ -76,10 +76,10 @@ tracks/5/keys = { "transitions": PackedFloat32Array(1, 1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }, { "args": [], -"method": &"attack" +"method": &"attack2" }] } tracks/6/type = "method" @@ -93,7 +93,7 @@ tracks/6/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"cast_attack_particle" +"method": &"cast_attack_particle1" }] } tracks/7/type = "value" diff --git a/resource/skill_animation/hero01_long_flash.tres b/resource/skill_animation/hero01_long_flash.tres index 896b801..1cc85a0 100644 --- a/resource/skill_animation/hero01_long_flash.tres +++ b/resource/skill_animation/hero01_long_flash.tres @@ -112,6 +112,6 @@ tracks/7/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"cast_attack_particle" +"method": &"cast_attack_particle1" }] } diff --git a/resource/skill_animation/hero01_long_skill01.tres b/resource/skill_animation/hero01_long_skill01.tres index 35d5330..fb2a04c 100644 --- a/resource/skill_animation/hero01_long_skill01.tres +++ b/resource/skill_animation/hero01_long_skill01.tres @@ -75,7 +75,7 @@ tracks/5/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }] } tracks/6/type = "value" diff --git a/resource/skill_animation/hero01_long_skill02.tres b/resource/skill_animation/hero01_long_skill02.tres index 60c1843..7fde524 100644 --- a/resource/skill_animation/hero01_long_skill02.tres +++ b/resource/skill_animation/hero01_long_skill02.tres @@ -88,7 +88,7 @@ tracks/6/keys = { "transitions": PackedFloat32Array(1), "values": [{ "args": [], -"method": &"attack" +"method": &"attack1" }] } tracks/7/type = "value" diff --git a/scene/character/player.tscn b/scene/character/player.tscn index ef7fb38..d58078a 100644 --- a/scene/character/player.tscn +++ b/scene/character/player.tscn @@ -1,8 +1,8 @@ -[gd_scene load_steps=8 format=3 uid="uid://ba7pkdaq5y8nl"] +[gd_scene load_steps=8 format=3 uid="uid://ba2trga1rrba8"] [ext_resource type="PackedScene" uid="uid://8rcvw1vnjcf7" path="res://scene/character/character.tscn" id="1_pot50"] +[ext_resource type="SpriteFrames" uid="uid://ce83cuqwgwwi4" path="res://resource/animation/character/hero01_long_attack.aseprite" id="2_7gyv2"] [ext_resource type="Script" path="res://script/character/player/combo.gd" id="2_i44w8"] -[ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="2_kqo4a"] [ext_resource type="Script" path="res://script/character/player/player_input.gd" id="3_n07go"] [ext_resource type="Script" path="res://script/character/player/core.gd" id="3_rxdse"] [ext_resource type="Script" path="res://script/character/player/player_info.gd" id="4_mi1lk"] @@ -10,13 +10,10 @@ [node name="Character" instance=ExtResource("1_pot50")] -[node name="Status" parent="." index="1"] -speed_up_rate = 0.0 - [node name="View" parent="." index="2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.693056, 0) -sprite_frames = ExtResource("2_kqo4a") -animation = &"fist_attack01" +sprite_frames = ExtResource("2_7gyv2") +animation = &"long_attack04" [node name="Combo" type="Node3D" parent="." index="8"] unique_name_in_owner = true diff --git a/scene/effect/particle/_particle_hit_ground.tscn b/scene/effect/particle/_particle_hit_ground.tscn index f448980..7015102 100644 --- a/scene/effect/particle/_particle_hit_ground.tscn +++ b/scene/effect/particle/_particle_hit_ground.tscn @@ -31,6 +31,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.358925, 0) size = Vector3(1, 5, 1) texture_albedo = ExtResource("2_vkpca") modulate = Color(0, 0, 0, 1) +upper_fade = 21.3037 cull_mask = 1 script = ExtResource("3_dwi0o") lifetime = 3.0 @@ -40,6 +41,7 @@ scale_curve = SubResource("Curve_w5jkx") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.358925, 0) size = Vector3(1, 5, 1) texture_albedo = ExtResource("4_jxr0h") +upper_fade = 21.3037 cull_mask = 1 script = ExtResource("3_dwi0o") lifetime = 0.5 @@ -50,6 +52,7 @@ rotate = 15 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.358925, 0) size = Vector3(1, 5, 1) texture_albedo = ExtResource("5_c3jkk") +upper_fade = 21.3037 cull_mask = 1 script = ExtResource("3_dwi0o") lifetime = 0.1 @@ -59,6 +62,7 @@ scale_curve = SubResource("Curve_18e7g") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.358925, 0) size = Vector3(1, 5, 1) texture_albedo = ExtResource("6_2la8o") +upper_fade = 21.3037 cull_mask = 1 script = ExtResource("3_dwi0o") lifetime = 0.1 diff --git a/scene/effect/particle/_particle_slash1.tscn b/scene/effect/particle/_particle_slash1.tscn index 2008bd5..9d58212 100644 --- a/scene/effect/particle/_particle_slash1.tscn +++ b/scene/effect/particle/_particle_slash1.tscn @@ -28,6 +28,7 @@ shader_parameter/tex_mask = ExtResource("4_wvohg") script = ExtResource("1_fx8ev") [node name="Slash" type="GPUParticles3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) layers = 512 material_override = SubResource("ShaderMaterial_hupcc") cast_shadow = 0 @@ -36,14 +37,14 @@ emitting = false amount = 1 lifetime = 0.25 one_shot = true -speed_scale = 1.5 +speed_scale = 1.8 fixed_fps = 60 local_coords = true process_material = ExtResource("2_eq67i") draw_pass_1 = ExtResource("3_idjnm") [node name="Skew1" type="GPUParticles3D" parent="."] -transform = Transform3D(0.99, 0, 0, 0, 0.99, 0, 0, 0, 0.99, 0, 0, 0) +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) layers = 512 material_override = SubResource("ShaderMaterial_ntvqm") cast_shadow = 0 @@ -52,7 +53,7 @@ emitting = false amount = 1 lifetime = 0.25 one_shot = true -speed_scale = 1.5 +speed_scale = 1.8 fixed_fps = 60 local_coords = true process_material = ExtResource("2_eq67i") diff --git a/scene/effect/particle/_particle_slash2.tscn b/scene/effect/particle/_particle_slash2.tscn new file mode 100644 index 0000000..4c35bb8 --- /dev/null +++ b/scene/effect/particle/_particle_slash2.tscn @@ -0,0 +1,59 @@ +[gd_scene load_steps=11 format=3 uid="uid://c2uyg7ktya04f"] + +[ext_resource type="Script" path="res://script/effect/particle.gd" id="1_wk0x7"] +[ext_resource type="Shader" path="res://render/shader/effect_slash.gdshader" id="2_jb5vy"] +[ext_resource type="Texture2D" uid="uid://c4byf37he3mjt" path="res://render/texture/particle/noise/noise1.png" id="3_t53xp"] +[ext_resource type="Texture2D" uid="uid://dbwhs56fum5o0" path="res://render/texture/particle/mask/mask7.png" id="4_2sdhc"] +[ext_resource type="Texture2D" uid="uid://dd3e7ol8qa5eq" path="res://render/texture/particle/noise/noise2.png" id="5_eiojh"] +[ext_resource type="Material" uid="uid://dubkkji6sm8on" path="res://render/process_material/slash_normal.tres" id="6_4vq1o"] +[ext_resource type="ArrayMesh" uid="uid://dq207a0waxk0j" path="res://render/mesh/slash1.obj" id="7_cx4ke"] +[ext_resource type="Shader" path="res://render/shader/effect_skew1.gdshader" id="8_nm3rx"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_hupcc"] +render_priority = 0 +shader = ExtResource("2_jb5vy") +shader_parameter/tex_main = ExtResource("3_t53xp") +shader_parameter/tex_noise = ExtResource("5_eiojh") +shader_parameter/tex_mask = ExtResource("4_2sdhc") + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_ntvqm"] +render_priority = 0 +shader = ExtResource("8_nm3rx") +shader_parameter/distortionView = 0.03 +shader_parameter/speedView = 0.5 +shader_parameter/noise = ExtResource("3_t53xp") +shader_parameter/tex_mask = ExtResource("4_2sdhc") + +[node name="Particle" type="Node3D"] +script = ExtResource("1_wk0x7") + +[node name="Slash" type="GPUParticles3D" parent="."] +layers = 512 +material_override = SubResource("ShaderMaterial_hupcc") +cast_shadow = 0 +gi_mode = 0 +emitting = false +amount = 1 +lifetime = 0.25 +one_shot = true +speed_scale = 1.5 +fixed_fps = 60 +local_coords = true +process_material = ExtResource("6_4vq1o") +draw_pass_1 = ExtResource("7_cx4ke") + +[node name="Skew1" type="GPUParticles3D" parent="."] +transform = Transform3D(0.99, 0, 0, 0, 0.99, 0, 0, 0, 0.99, 0, 0, 0) +layers = 512 +material_override = SubResource("ShaderMaterial_ntvqm") +cast_shadow = 0 +gi_mode = 0 +emitting = false +amount = 1 +lifetime = 0.25 +one_shot = true +speed_scale = 1.5 +fixed_fps = 60 +local_coords = true +process_material = ExtResource("6_4vq1o") +draw_pass_1 = ExtResource("7_cx4ke") diff --git a/scene/effect/particle/hero01_common_skill02.tscn b/scene/effect/particle/hero01_common_skill02.tscn index 4d566e4..6c921ac 100644 --- a/scene/effect/particle/hero01_common_skill02.tscn +++ b/scene/effect/particle/hero01_common_skill02.tscn @@ -1,9 +1,5 @@ -[gd_scene load_steps=2 format=3 uid="uid://cswp0rj0gep6c"] +[gd_scene load_steps=2 format=3 uid="uid://b2kvqtshg5yvk"] -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash1.tscn" id="1_qyqjx"] +[ext_resource type="PackedScene" uid="uid://c2uyg7ktya04f" path="res://scene/effect/particle/_particle_slash2.tscn" id="1_kmcdi"] -[node name="Particle" instance=ExtResource("1_qyqjx")] -transform = Transform3D(1.5, 0, 0, 0, 1, 0, 0, 0, 1.2, 0, 0, 0) - -[node name="Skew1" parent="." index="1"] -one_shot = false +[node name="Particle" instance=ExtResource("1_kmcdi")] diff --git a/scene/effect/particle/hero01_fist_air_skill01_0.tscn b/scene/effect/particle/hero01_fist_air_skill01_0.tscn deleted file mode 100644 index 34909bf..0000000 --- a/scene/effect/particle/hero01_fist_air_skill01_0.tscn +++ /dev/null @@ -1,9 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://dcsls0bn14i04"] - -[ext_resource type="PackedScene" uid="uid://cxopc3y11lwg1" path="res://scene/effect/particle/_particle_dash1.tscn" id="1_eappe"] - -[node name="Particle" instance=ExtResource("1_eappe")] -rotation_order = 4 - -[node name="Dash" parent="." index="0"] -transform = Transform3D(0.866025, 0.5, 0, -0.5, 0.866025, 0, 0, 0, 1, 0, 0, 0) diff --git a/scene/effect/particle/hero01_fist_air_skill01_1.tscn b/scene/effect/particle/hero01_fist_air_skill01_1.tscn index c32eaec..34909bf 100644 --- a/scene/effect/particle/hero01_fist_air_skill01_1.tscn +++ b/scene/effect/particle/hero01_fist_air_skill01_1.tscn @@ -1,5 +1,9 @@ -[gd_scene load_steps=2 format=3 uid="uid://ds7mp5l20ypb6"] +[gd_scene load_steps=2 format=3 uid="uid://dcsls0bn14i04"] -[ext_resource type="PackedScene" uid="uid://5d1a3s6x77wd" path="res://scene/effect/particle/_particle_hit_ground.tscn" id="1_tw6qm"] +[ext_resource type="PackedScene" uid="uid://cxopc3y11lwg1" path="res://scene/effect/particle/_particle_dash1.tscn" id="1_eappe"] -[node name="Particle" instance=ExtResource("1_tw6qm")] +[node name="Particle" instance=ExtResource("1_eappe")] +rotation_order = 4 + +[node name="Dash" parent="." index="0"] +transform = Transform3D(0.866025, 0.5, 0, -0.5, 0.866025, 0, 0, 0, 1, 0, 0, 0) diff --git a/scene/effect/particle/hero01_fist_air_skill01_2.tscn b/scene/effect/particle/hero01_fist_air_skill01_2.tscn new file mode 100644 index 0000000..c32eaec --- /dev/null +++ b/scene/effect/particle/hero01_fist_air_skill01_2.tscn @@ -0,0 +1,5 @@ +[gd_scene load_steps=2 format=3 uid="uid://ds7mp5l20ypb6"] + +[ext_resource type="PackedScene" uid="uid://5d1a3s6x77wd" path="res://scene/effect/particle/_particle_hit_ground.tscn" id="1_tw6qm"] + +[node name="Particle" instance=ExtResource("1_tw6qm")] diff --git a/scene/effect/particle/hero01_long_attack03_0.tscn b/scene/effect/particle/hero01_long_attack03_0.tscn deleted file mode 100644 index dfce45e..0000000 --- a/scene/effect/particle/hero01_long_attack03_0.tscn +++ /dev/null @@ -1,6 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://bn2ktr7iynt5"] - -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash1.tscn" id="1_p44mg"] - -[node name="Particle" instance=ExtResource("1_p44mg")] -transform = Transform3D(1, 0, 0, 0, -0.707107, 0.353553, 0, -0.707107, -0.353553, 0, 0, 0) diff --git a/scene/effect/particle/hero01_long_attack03_1.tscn b/scene/effect/particle/hero01_long_attack03_1.tscn index c4b03e7..dfce45e 100644 --- a/scene/effect/particle/hero01_long_attack03_1.tscn +++ b/scene/effect/particle/hero01_long_attack03_1.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=2 format=3 uid="uid://dj04l4oge27f0"] +[gd_scene load_steps=2 format=3 uid="uid://bn2ktr7iynt5"] -[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash1.tscn" id="1_078jk"] +[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash1.tscn" id="1_p44mg"] -[node name="Particle" instance=ExtResource("1_078jk")] -transform = Transform3D(1, 0, 0, 0, 0.5, 0.433012, 0, -0.866026, 0.25, 0, 0, 0) +[node name="Particle" instance=ExtResource("1_p44mg")] +transform = Transform3D(1, 0, 0, 0, -0.707107, 0.353553, 0, -0.707107, -0.353553, 0, 0, 0) diff --git a/scene/effect/particle/hero01_long_attack03_2.tscn b/scene/effect/particle/hero01_long_attack03_2.tscn new file mode 100644 index 0000000..c4b03e7 --- /dev/null +++ b/scene/effect/particle/hero01_long_attack03_2.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3 uid="uid://dj04l4oge27f0"] + +[ext_resource type="PackedScene" uid="uid://b2h4pcmlii7dg" path="res://scene/effect/particle/_particle_slash1.tscn" id="1_078jk"] + +[node name="Particle" instance=ExtResource("1_078jk")] +transform = Transform3D(1, 0, 0, 0, 0.5, 0.433012, 0, -0.866026, 0.25, 0, 0, 0) diff --git a/scene/effect/readiness/readiness_bullet.tscn b/scene/effect/readiness/readiness_bullet.tscn index 3251b86..18ce759 100644 --- a/scene/effect/readiness/readiness_bullet.tscn +++ b/scene/effect/readiness/readiness_bullet.tscn @@ -6,4 +6,5 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.358925, 0) size = Vector3(1, 1, 1) texture_albedo = ExtResource("1_30j48") +normal_fade = 0.1 cull_mask = 1 diff --git a/scene/effect/readiness/readiness_hero.tscn b/scene/effect/readiness/readiness_hero.tscn index 0a9786a..45f36c1 100644 --- a/scene/effect/readiness/readiness_hero.tscn +++ b/scene/effect/readiness/readiness_hero.tscn @@ -6,4 +6,5 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.358925, 0) size = Vector3(1, 1, 1) texture_albedo = ExtResource("1_msawg") +normal_fade = 0.1 cull_mask = 1 diff --git a/scene/effect/readiness/readiness_monster.tscn b/scene/effect/readiness/readiness_monster.tscn index 39dd012..2eec996 100644 --- a/scene/effect/readiness/readiness_monster.tscn +++ b/scene/effect/readiness/readiness_monster.tscn @@ -6,4 +6,5 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.358925, 0) size = Vector3(1, 1, 1) texture_albedo = ExtResource("1_2mpei") +normal_fade = 0.1 cull_mask = 1 diff --git a/script/character/battle.gd b/script/character/battle.gd index 96cbdc0..9d5dcaf 100644 --- a/script/character/battle.gd +++ b/script/character/battle.gd @@ -13,22 +13,27 @@ class HitInfo: var dir : Vector2 var attack : AttackCfg -func attack(): - call_deferred("_attack") +func attack1(): + var attack = status.skill_cfg.get_attack1() + var attack_box = status.skill_cfg.get_attack1_box() + call_deferred("_attack",attack,attack_box) -func _attack(): +func attack2(): + var attack = status.skill_cfg.get_attack2() + var attack_box = status.skill_cfg.get_attack2_box() + call_deferred("_attack",attack,attack_box) + +func _attack(attack,attack_box): if !status.skill_cfg: return - var attack = status.skill_cfg.get_attack(status.skill_attack_index) as AttackCfg - status.skill_attack_index += 1 var enemy_list = Global.character_mgr.get_enemy_list(character.id()) var pos = character.pos() var attack_dir = status.skill_dir.normalized() - var attack_height = attack.height - var attack_size = Util.grid_vector2(attack.size) - var attack_radius = attack.radius - var offset_xz = attack_dir * Util.grid_float(attack.offset.x) - pos += Vector3(offset_xz.x,Util.grid_float(attack.offset.y),offset_xz.y) + var attack_height = attack_box.height + var attack_size = Util.grid_vector2(attack_box.size) + var attack_radius = attack_box.radius + var offset_xz = attack_dir * Util.grid_float(attack_box.offset.x) + pos += Vector3(offset_xz.x,Util.grid_float(attack_box.offset.y),offset_xz.y) var is_stuck = false for enemy in enemy_list: var target_pos = enemy.pos() @@ -44,7 +49,7 @@ func _attack(): if !is_stuck and !attack.is_force_pause: skill.on_attack_miss() -func add_attack(from:int,dir:Vector2,attack:AttackCfg): +func add_attack(from:int,dir:Vector2 ,attack:AttackCfg): var hit_info = HitInfo.new() hit_info.from = from hit_info.to = character.id() diff --git a/script/character/effect.gd b/script/character/effect.gd index 69c2a3a..18cecb9 100644 --- a/script/character/effect.gd +++ b/script/character/effect.gd @@ -65,16 +65,16 @@ func cast_image(res:Resource): func cast_after_image():cast_image(afterimage) func cast_corpse():cast_image(corpse) - -func cast_attack_particle():_cast_attack_particle(true) -func cast_attack_particle_release():_cast_attack_particle(false) func cast_particle(resource:Resource ,is_attach:bool):_cast_particle(resource,is_attach) -func _cast_attack_particle(is_attach:bool): +func cast_attack_particle1():_cast_attack_particle(1,true) +func cast_attack_particle1_release():_cast_attack_particle(1,false) +func cast_attack_particle2():_cast_attack_particle(2,true) +func cast_attack_particle2_release():_cast_attack_particle(2,false) +func _cast_attack_particle(index:int ,is_attach:bool): if !status.skill_cfg: return - var attack_particle = status.skill_cfg.get_attack_particle(status.skill_attack_effect_index) - status.skill_attack_effect_index += 1 + var attack_particle = status.skill_cfg.get_attack_particle(index) if !attack_particle: print("未配置技能攻击特效:",status.skill_cfg.resource_path) return diff --git a/script/character/skill.gd b/script/character/skill.gd index 0b1abc8..a6a23ad 100644 --- a/script/character/skill.gd +++ b/script/character/skill.gd @@ -34,8 +34,6 @@ func cast_skill(cfg:SkillCfg,cast_dir:Vector2): status.skill_cfg = cfg status.skill_dir = cast_dir status.break_level = Enum.EBreakLevel.None - status.skill_attack_index = 0 - status.skill_attack_effect_index = 0 if cast_dir.x != 0: status.is_right = cast_dir.x > 0 play(animation_name,-1,Setting.animation_speed_scale) else: @@ -51,8 +49,6 @@ func break_skill(): status.is_skill_running = false status.skill_cfg = null status.break_level = Enum.EBreakLevel.Walk - status.skill_attack_index = 0 - status.skill_attack_effect_index = 0 effect.release_effect() func cancel_skill(): diff --git a/script/character/status.gd b/script/character/status.gd index b2533df..c78d958 100644 --- a/script/character/status.gd +++ b/script/character/status.gd @@ -64,8 +64,6 @@ class_name Status @export var skill_dir : Vector2 #技能释放方向 @export var skill_move_speed : float #技能位移速度 @export var skill_float_speed : float #技能y位移速度 -@export var skill_attack_index : int #技能攻击段数 -@export var skill_attack_effect_index : int #技能特效段数 @export_category("玩家技能状态") @export var input_dir : Vector2 #指令方向 diff --git a/script/config/attack_box_cfg.gd b/script/config/attack_box_cfg.gd new file mode 100644 index 0000000..2b45f91 --- /dev/null +++ b/script/config/attack_box_cfg.gd @@ -0,0 +1,8 @@ +extends Resource + +class_name AttackBoxCfg + +@export var height : float = 1 #判定框高度 +@export var radius : float #圆形判定框 半径 +@export var size : Vector2 #矩形判定框 大小 +@export var offset : Vector2 #偏移 diff --git a/script/config/attack_cfg.gd b/script/config/attack_cfg.gd index d330b08..4ae8ba7 100644 --- a/script/config/attack_cfg.gd +++ b/script/config/attack_cfg.gd @@ -22,10 +22,3 @@ class_name AttackCfg @export_group("卡帧") @export var pause_time : float #卡帧时间 @export var is_force_pause : bool #是否强制卡帧 - -@export_group("判定框") -@export var height : float = 2 #判定框高度 -@export var radius : float #圆形判定框 半径 -@export var size : Vector2 = Vector2(2,1) #矩形判定框 大小 -@export var offset : Vector2 = Vector2(1,0) #偏移 - diff --git a/script/config/skill_cfg.gd b/script/config/skill_cfg.gd index 5113b94..a248445 100644 --- a/script/config/skill_cfg.gd +++ b/script/config/skill_cfg.gd @@ -5,10 +5,11 @@ class_name SkillCfg @export var name : String @export var skill_animation : Animation -@export var attack_list : Array[AttackCfg] -@export var sub_character_list : Array[CharacterCfg] @export var free_lock : bool - +@export var attack1 : AttackCfg +@export var attack1_box : AttackBoxCfg +@export var attack2 : AttackCfg +@export var attack2_box : AttackBoxCfg @export var refresh_animation : bool : get:return false set(value):if Engine.is_editor_hint():check_animation() @@ -33,13 +34,10 @@ func check_animation(): Util.refresh_animation_lib() skill_animation = load(path) -func get_attack(index:int)->AttackCfg: - if !attack_list: - return ResourceManager.cfg_attack_normal - if index >= len(attack_list): - index = len(attack_list) - 1 - var attack = attack_list[index] as AttackCfg - return attack +func get_attack1()->AttackCfg:return attack1 if attack1 else ResourceManager.cfg_attack_normal +func get_attack1_box()->AttackBoxCfg:return attack1_box if attack1_box else ResourceManager.cfg_attack_box_normal +func get_attack2()->AttackCfg:return attack2 if attack2 else ResourceManager.cfg_attack_normal +func get_attack2_box()->AttackBoxCfg:return attack2_box if attack2_box else ResourceManager.cfg_attack_box_normal func get_attack_particle(index:int)->Resource: var res_name = Util.get_resource_name(self) diff --git a/script/manager/resource_manager.gd b/script/manager/resource_manager.gd index c7ab8b1..ccc01b6 100644 --- a/script/manager/resource_manager.gd +++ b/script/manager/resource_manager.gd @@ -18,5 +18,6 @@ var particle_hit_blunt = load("res://scene/effect/particle/particle_hit_blunt.ts var cfg_character_player = load("res://config/character/hero01.tres") var cfg_character_monster_test = load("res://config/character/monster02.tres") #attack -var cfg_attack_normal = load("res://config/attack/normal_hit.tres") +var cfg_attack_normal = load("res://config/attack/sharp_normal_hit.tres") +var cfg_attack_box_normal = load("res://config/attack_box/circle_normal.tres") var cfg_attack_rebound = load("res://config/attack/rebound.tres")