diff --git a/config/attack/blunt_normal_hit.tres b/config/attack/blunt_normal_hit.tres index adddc4f..5ee7043 100644 --- a/config/attack/blunt_normal_hit.tres +++ b/config/attack/blunt_normal_hit.tres @@ -5,11 +5,10 @@ [resource] script = ExtResource("1_w5b6b") damage_rate = 1.0 -break_level = 1 +break_level = 3 stun_attack = 10.0 damage_type = 1 is_floating = false -is_hit_down = false is_rebound = false is_stop_self = true is_throw_check = false diff --git a/config/character/monster04.tres b/config/character/monster04.tres new file mode 100644 index 0000000..435e455 --- /dev/null +++ b/config/character/monster04.tres @@ -0,0 +1,27 @@ +[gd_resource type="Resource" script_class="CharacterCfg" load_steps=8 format=3 uid="uid://c8octkdafgram"] + +[ext_resource type="Resource" uid="uid://b26gc616anvo1" path="res://config/character_ai/normal.tres" id="1_xf3mu"] +[ext_resource type="Resource" uid="uid://dx54fjf5t0uu8" path="res://config/character_move/normal.tres" id="2_t6nfv"] +[ext_resource type="Resource" uid="uid://dpajmgrlaytah" path="res://config/character_mp/normal.tres" id="3_bhffc"] +[ext_resource type="Script" path="res://script/config/character_cfg.gd" id="4_ujtb4"] +[ext_resource type="Resource" uid="uid://dlaekoamystx3" path="res://config/character_shield/normal.tres" id="5_dyjq6"] +[ext_resource type="SpriteFrames" uid="uid://wovp1xbbrt2h" path="res://resource/animation/character/monster04_move.aseprite" id="6_ti81h"] +[ext_resource type="Resource" uid="uid://cac6mk6g078vn" path="res://config/character_stun/normal.tres" id="7_hjvst"] + +[resource] +script = ExtResource("4_ujtb4") +name = "monster04" +type = 1 +sprite_frames = ExtResource("6_ti81h") +sprite_height = 54 +sprite_width = 16 +move = ExtResource("2_t6nfv") +shield = ExtResource("5_dyjq6") +stun = ExtResource("7_hjvst") +mp = ExtResource("3_bhffc") +ai = ExtResource("1_xf3mu") +hp_max = 100.0 +attack = 10.0 +sub_character_auto_create = false +material_on = 0 +material_off = 0 diff --git a/config/skill_player_weapon/hero01_fist_attack01.tres b/config/skill_player_weapon/hero01_fist_attack01.tres index ee93c8b..1bfb783 100644 --- a/config/skill_player_weapon/hero01_fist_attack01.tres +++ b/config/skill_player_weapon/hero01_fist_attack01.tres @@ -23,6 +23,8 @@ stance_to = 1 break_level = 3 is_charging = false mp_cost = 0 +warn_type = 0 +with_stop = false refresh_animation = false sprite_frames = ExtResource("4_ymqrn") animation_name = "fist_attack01" diff --git a/resource/animation/character/_design_monster.aseprite b/resource/animation/character/_design_monster.aseprite index d3b2370..8bd5d6e 100644 Binary files a/resource/animation/character/_design_monster.aseprite and b/resource/animation/character/_design_monster.aseprite differ diff --git a/resource/animation/character/_design_monster.png b/resource/animation/character/_design_monster.png index 433f358..567a61f 100644 Binary files a/resource/animation/character/_design_monster.png and b/resource/animation/character/_design_monster.png differ diff --git a/resource/animation/character/hero01_fist_attack.aseprite b/resource/animation/character/hero01_fist_attack.aseprite index 8be8cf1..bd3eb46 100644 Binary files a/resource/animation/character/hero01_fist_attack.aseprite and b/resource/animation/character/hero01_fist_attack.aseprite differ diff --git a/resource/animation/character/hero01_fist_attack.png b/resource/animation/character/hero01_fist_attack.png index 24fb645..042fae2 100644 Binary files a/resource/animation/character/hero01_fist_attack.png and b/resource/animation/character/hero01_fist_attack.png differ diff --git a/resource/animation/character/monster03_move.aseprite b/resource/animation/character/monster03_move.aseprite index d9c3bab..79753c5 100644 Binary files a/resource/animation/character/monster03_move.aseprite and b/resource/animation/character/monster03_move.aseprite differ diff --git a/resource/animation/character/monster03_move.png b/resource/animation/character/monster03_move.png index 04e6228..b1c9a7a 100644 Binary files a/resource/animation/character/monster03_move.png and b/resource/animation/character/monster03_move.png differ diff --git a/resource/animation/character/monster04_move.aseprite b/resource/animation/character/monster04_move.aseprite new file mode 100644 index 0000000..5ba4904 Binary files /dev/null and b/resource/animation/character/monster04_move.aseprite differ diff --git a/resource/animation/character/monster04_move.aseprite.import b/resource/animation/character/monster04_move.aseprite.import new file mode 100644 index 0000000..ed41575 --- /dev/null +++ b/resource/animation/character/monster04_move.aseprite.import @@ -0,0 +1,25 @@ +[remap] + +importer="Aseprite SpriteFrames Import" +type="SpriteFrames" +uid="uid://wovp1xbbrt2h" +path="res://.godot/imported/monster04_move.aseprite-a609052f9400cd94e139e7af39fe8046.res" + +[deps] + +source_file="res://resource/animation/character/monster04_move.aseprite" +dest_files=["res://.godot/imported/monster04_move.aseprite-a609052f9400cd94e139e7af39fe8046.res"] + +[params] + +spritesheet/layout=0 +spritesheet/fixed_rows_count=1 +spritesheet/fixed_columns_count=1 +spritesheet/border_type=0 +spritesheet/trim=false +spritesheet/ignore_empty=false +spritesheet/merge_duplicates=false +animation/default/name="default" +animation/default/direction=0 +animation/default/repeat_count=0 +animation/autoplay="" diff --git a/resource/animation/character/monster04_move.png b/resource/animation/character/monster04_move.png new file mode 100644 index 0000000..14d4237 Binary files /dev/null and b/resource/animation/character/monster04_move.png differ diff --git a/resource/animation/character/monster04_move.png.import b/resource/animation/character/monster04_move.png.import new file mode 100644 index 0000000..c0c925e --- /dev/null +++ b/resource/animation/character/monster04_move.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bi3cxe0lhdifg" +path="res://.godot/imported/monster04_move.png-4f647a225c27df09ab604c60957bb7e4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resource/animation/character/monster04_move.png" +dest_files=["res://.godot/imported/monster04_move.png-4f647a225c27df09ab604c60957bb7e4.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/scene/ai/monster04.tscn b/scene/ai/monster04.tscn new file mode 100644 index 0000000..2880319 --- /dev/null +++ b/scene/ai/monster04.tscn @@ -0,0 +1,66 @@ +[gd_scene load_steps=9 format=3 uid="uid://c66a72aojgj43"] + +[ext_resource type="Script" path="res://addons/beehave/nodes/beehave_tree.gd" id="1_lfgx0"] +[ext_resource type="Script" path="res://addons/beehave/nodes/composites/sequence.gd" id="2_mw6xw"] +[ext_resource type="Script" path="res://script/ai/action/action_find_target.gd" id="3_lo3nv"] +[ext_resource type="Script" path="res://addons/beehave/nodes/composites/selector.gd" id="4_utp2v"] +[ext_resource type="Script" path="res://script/ai/action_role_check/action_role_check_is.gd" id="5_4j1dq"] +[ext_resource type="Script" path="res://script/ai/action_with_target/action_move_to.gd" id="6_d1xy8"] +[ext_resource type="Script" path="res://script/ai/action_with_target/action_cast_skill.gd" id="7_x51x6"] +[ext_resource type="Script" path="res://script/ai/action/action_wait.gd" id="8_sr1ot"] + +[node name="BeehaveTree" type="Node" node_paths=PackedStringArray("blackboard")] +script = ExtResource("1_lfgx0") +blackboard = NodePath("@Node@19489") + +[node name="SequenceComposite" type="Node" parent="."] +script = ExtResource("2_mw6xw") + +[node name="ActionFindTarget" type="Node" parent="SequenceComposite"] +script = ExtResource("3_lo3nv") + +[node name="SelectorComposite" type="Node" parent="SequenceComposite"] +script = ExtResource("4_utp2v") + +[node name="SequenceComposite" type="Node" parent="SequenceComposite/SelectorComposite"] +script = ExtResource("2_mw6xw") + +[node name="ActionRoleCheckIs" type="Node" parent="SequenceComposite/SelectorComposite/SequenceComposite"] +script = ExtResource("5_4j1dq") +key = 1 + +[node name="ActionMoveTo" type="Node" parent="SequenceComposite/SelectorComposite/SequenceComposite"] +script = ExtResource("6_d1xy8") +dist_max = 2.0 + +[node name="ActionCastSkill" type="Node" parent="SequenceComposite/SelectorComposite/SequenceComposite"] +script = ExtResource("7_x51x6") + +[node name="SequenceComposite2" type="Node" parent="SequenceComposite/SelectorComposite"] +script = ExtResource("2_mw6xw") + +[node name="ActionRoleCheckIs" type="Node" parent="SequenceComposite/SelectorComposite/SequenceComposite2"] +script = ExtResource("5_4j1dq") +key = 2 + +[node name="ActionMoveTo" type="Node" parent="SequenceComposite/SelectorComposite/SequenceComposite2"] +script = ExtResource("6_d1xy8") +dist_min = 3.0 +dist_max = 4.0 + +[node name="ActionCastSkill" type="Node" parent="SequenceComposite/SelectorComposite/SequenceComposite2"] +script = ExtResource("7_x51x6") + +[node name="SequenceComposite3" type="Node" parent="SequenceComposite/SelectorComposite"] +script = ExtResource("2_mw6xw") + +[node name="ActionRoleCheckIs" type="Node" parent="SequenceComposite/SelectorComposite/SequenceComposite3"] +script = ExtResource("5_4j1dq") + +[node name="ActionMoveTo" type="Node" parent="SequenceComposite/SelectorComposite/SequenceComposite3"] +script = ExtResource("6_d1xy8") +dist_min = 4.0 + +[node name="ActionWait" type="Node" parent="SequenceComposite/SelectorComposite/SequenceComposite3"] +script = ExtResource("8_sr1ot") +wait_time = 2.0 diff --git a/scene/launcher.tscn b/scene/launcher.tscn index 632e36e..1f10548 100644 --- a/scene/launcher.tscn +++ b/scene/launcher.tscn @@ -21,7 +21,7 @@ [ext_resource type="Script" path="res://script/manager/item_manager.gd" id="12_xwufn"] [ext_resource type="Script" path="res://script/character/status.gd" id="18_nr8sb"] [ext_resource type="SpriteFrames" uid="uid://2cb8lknel0ih" path="res://resource/animation/character/basic_move.aseprite" id="20_4ni1a"] -[ext_resource type="SpriteFrames" uid="uid://cajgs8smbkjan" path="res://resource/animation/character/hero01_fist_skill01.aseprite" id="21_wpe47"] +[ext_resource type="SpriteFrames" uid="uid://bhsotj76tuovy" path="res://resource/animation/character/hero01_fist_attack.aseprite" id="21_pgtwe"] [ext_resource type="AnimationLibrary" uid="uid://croik07a1qko5" path="res://resource/skill_animation_library/animation_library.tres" id="22_qyapv"] [ext_resource type="Script" path="res://script/character/skill.gd" id="23_783eu"] [ext_resource type="Script" path="res://script/character/move.gd" id="25_d520l"] @@ -272,9 +272,8 @@ pixel_size = 0.02 double_sided = false alpha_cut = 2 texture_filter = 0 -sprite_frames = ExtResource("21_wpe47") -animation = &"fist_air_skill01" -frame = 8 +sprite_frames = ExtResource("21_pgtwe") +animation = &"fist_attack01" [node name="Throw" type="AnimatedSprite3D" parent="EditorTool/Character"] unique_name_in_owner = true diff --git a/script/character/player/player_action.gd b/script/character/player/player_action.gd index b3dee42..88bdc1b 100644 --- a/script/character/player/player_action.gd +++ b/script/character/player/player_action.gd @@ -70,7 +70,7 @@ func check_action_pressed(key: String) -> bool: "weapon_pre": combo.weapon_index_change(-1) "weapon_next": combo.weapon_index_change(1) "test_1": - Global.character_mgr.create_character(ResourceManager.cfg_character_monster_test1, Enum.ETeam.Monster, character.pos()) + Global.character_mgr.create_character(ResourceManager.cfg_character_monster_test4, Enum.ETeam.Monster, character.pos()) "test_2": Global.character_mgr.create_character(ResourceManager.cfg_character_monster_test2, Enum.ETeam.Monster, character.pos()) "test_3": diff --git a/script/manager/resource_manager.gd b/script/manager/resource_manager.gd index a492237..c38ab1c 100644 --- a/script/manager/resource_manager.gd +++ b/script/manager/resource_manager.gd @@ -50,6 +50,7 @@ var cfg_character_monster_test0: CharacterCfg = load("res://config/character/mon var cfg_character_monster_test1: CharacterCfg = load("res://config/character/monster01.tres") as CharacterCfg var cfg_character_monster_test2: CharacterCfg = load("res://config/character/monster02.tres") as CharacterCfg var cfg_character_monster_test3: CharacterCfg = load("res://config/character/monster03.tres") as CharacterCfg +var cfg_character_monster_test4: CharacterCfg = load("res://config/character/monster04.tres") as CharacterCfg #attack var cfg_attack_normal: AttackCfg = load("res://config/attack/sharp_normal_hit.tres") as AttackCfg var cfg_attack_box_normal: AttackBoxCfg = load("res://config/attack_box/circle_normal.tres") as AttackBoxCfg