diff --git a/assets/armorpaint/character_body.arm b/assets/armorpaint/character_body.arm index 1efbf1bb..15ddbf03 100644 Binary files a/assets/armorpaint/character_body.arm and b/assets/armorpaint/character_body.arm differ diff --git a/assets/armorpaint/exports/character_base.png b/assets/armorpaint/exports/character_base.png index 32e29b25..3882f828 100644 Binary files a/assets/armorpaint/exports/character_base.png and b/assets/armorpaint/exports/character_base.png differ diff --git a/assets/armorpaint/exports/character_metal.png b/assets/armorpaint/exports/character_metal.png index c9434100..20d0ccc5 100644 Binary files a/assets/armorpaint/exports/character_metal.png and b/assets/armorpaint/exports/character_metal.png differ diff --git a/assets/armorpaint/exports/character_nor.png b/assets/armorpaint/exports/character_nor.png index f55e3cae..89febf16 100644 Binary files a/assets/armorpaint/exports/character_nor.png and b/assets/armorpaint/exports/character_nor.png differ diff --git a/assets/armorpaint/exports/character_occ.png b/assets/armorpaint/exports/character_occ.png index 5fb09284..47590f3f 100644 Binary files a/assets/armorpaint/exports/character_occ.png and b/assets/armorpaint/exports/character_occ.png differ diff --git a/assets/armorpaint/exports/character_rough.png b/assets/armorpaint/exports/character_rough.png index aa7bd93f..2852dbff 100644 Binary files a/assets/armorpaint/exports/character_rough.png and b/assets/armorpaint/exports/character_rough.png differ diff --git a/project/assets/animations/player_character/swing_1.res b/project/assets/animations/player_character/swing_1.res index d4b4a7b0..30f774ac 100644 Binary files a/project/assets/animations/player_character/swing_1.res and b/project/assets/animations/player_character/swing_1.res differ diff --git a/project/assets/animations/player_character/swing_2.res b/project/assets/animations/player_character/swing_2.res index 94ef5882..5b055ed0 100644 Binary files a/project/assets/animations/player_character/swing_2.res and b/project/assets/animations/player_character/swing_2.res differ diff --git a/project/assets/animations/player_character/swing_3.res b/project/assets/animations/player_character/swing_3.res index a5b71c06..0a0a1d3b 100644 Binary files a/project/assets/animations/player_character/swing_3.res and b/project/assets/animations/player_character/swing_3.res differ diff --git a/project/assets/models/character.blend b/project/assets/models/character.blend index 92d2c96b..1c6c8ea5 100644 Binary files a/project/assets/models/character.blend and b/project/assets/models/character.blend differ diff --git a/project/assets/models/character.blend1 b/project/assets/models/character.blend1 index b7f09488..db626ac7 100644 Binary files a/project/assets/models/character.blend1 and b/project/assets/models/character.blend1 differ diff --git a/project/assets/models/character_character_base.png b/project/assets/models/character_character_base.png index 32e29b25..3882f828 100644 Binary files a/project/assets/models/character_character_base.png and b/project/assets/models/character_character_base.png differ diff --git a/project/assets/models/character_character_base.png.import b/project/assets/models/character_character_base.png.import index 4def6cf0..203da030 100644 --- a/project/assets/models/character_character_base.png.import +++ b/project/assets/models/character_character_base.png.import @@ -9,7 +9,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "4d4c79cffd628a6e7a7ee35742c5c5f0" +"md5": "10d86bc9ca00f6640d23ba80654d92c8" } [deps] diff --git a/project/assets/models/character_character_nor.png b/project/assets/models/character_character_nor.png index f55e3cae..89febf16 100644 Binary files a/project/assets/models/character_character_nor.png and b/project/assets/models/character_character_nor.png differ diff --git a/project/assets/models/character_character_nor.png.import b/project/assets/models/character_character_nor.png.import index 256ae02f..c1da8cb7 100644 --- a/project/assets/models/character_character_nor.png.import +++ b/project/assets/models/character_character_nor.png.import @@ -9,7 +9,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "6edbafc3f1b7f1cf22274162de664343" +"md5": "91fdf37d89b9ee821ca87fac54687054" } [deps] diff --git a/project/assets/models/character_character_rough.png b/project/assets/models/character_character_rough.png index aa7bd93f..2852dbff 100644 Binary files a/project/assets/models/character_character_rough.png and b/project/assets/models/character_character_rough.png differ diff --git a/project/assets/models/character_character_rough.png.import b/project/assets/models/character_character_rough.png.import index 8f47fffa..ab7c7ca5 100644 --- a/project/assets/models/character_character_rough.png.import +++ b/project/assets/models/character_character_rough.png.import @@ -9,7 +9,7 @@ metadata={ "vram_texture": true } generator_parameters={ -"md5": "91fad3a5e3597dac27508fd436ac2e12" +"md5": "cac5bb81c90bf4c8280f6c222e3e8079" } [deps] diff --git a/project/objects/player_body.tscn b/project/objects/player_body.tscn index f0d1e3c7..135affbb 100644 --- a/project/objects/player_body.tscn +++ b/project/objects/player_body.tscn @@ -3,6 +3,9 @@ [ext_resource type="PackedScene" uid="uid://cj3x6a8gm4ogn" path="res://assets/models/character.blend" id="1_yaurm"] [ext_resource type="PackedScene" uid="uid://2fxwkeifrwu3" path="res://objects/effects/impact_decal.tscn" id="2_1p07c"] +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_5j0w6"] +radius = 0.6 + [sub_resource type="GDScript" id="GDScript_yaurm"] script/source = "extends Node3D @@ -92,16 +95,16 @@ transitions = ["Start", "idle", SubResource("AnimationNodeStateMachineTransition graph_offset = Vector2(-228.371, 13.6511) [sub_resource type="BoxShape3D" id="BoxShape3D_1p07c"] -size = Vector3(0.674805, 1.01257, 0.494141) - -[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_5j0w6"] -radius = 0.252441 -height = 1.89893 +size = Vector3(0.547852, 1.3642, 0.728516) [node name="PlayerBody" type="PlayerBody"] collision_layer = 8 collision_mask = 9 +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.949463, 0) +shape = SubResource("CapsuleShape3D_5j0w6") + [node name="GroundCracksEmitter" type="Node3D" parent="."] script = SubResource("GDScript_yaurm") scene = ExtResource("2_1p07c") @@ -131,7 +134,7 @@ monitorable = false priority = 1 [node name="CollisionShape3D" type="CollisionShape3D" parent="character/character/Skeleton3D/BoneAttachment3D/DamageBox"] -transform = Transform3D(1.00001, -4.01926e-07, -4.32134e-07, 6.76648e-07, 1, 4.55242e-07, -2.16067e-07, -1.23109e-07, 1.00001, -5.96046e-08, -0.196067, -0.0270205) +transform = Transform3D(1, -1.06248e-06, 1.37836e-07, 6.46887e-07, 1, 1.88826e-07, 1.75089e-07, -2.18919e-07, 1, 1.78814e-07, -0.371879, -0.0270205) shape = SubResource("BoxShape3D_1p07c") [node name="PlayerIdleState" type="PlayerIdleState" parent="."] @@ -140,7 +143,7 @@ shape = SubResource("BoxShape3D_1p07c") [node name="LightAttack" type="PlayerBasicAttackState" parent="."] next_light_attack_state = NodePath("../LightAttack2") -trigger_next_margin = 0.15 +trigger_next_margin = 0.3 input_next_margin = 0.5 [node name="LightAttack2" type="PlayerBasicAttackState" parent="."] @@ -154,8 +157,4 @@ animation_name = "swing_3" trigger_next_margin = 0.0 input_next_margin = 0.0 -[node name="CollisionShape3D" type="CollisionShape3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.949463, 0) -shape = SubResource("CapsuleShape3D_5j0w6") - [editable path="character"]